Closed Bug 1154281 Opened 5 years ago Closed 5 years ago

Merge |UnixSocketConsumer| into |BluetoothSocket|

Categories

(Firefox OS Graveyard :: Bluetooth, defect)

All
Gonk (Firefox OS)
defect
Not set

Tracking

(firefox40 fixed)

RESOLVED FIXED
2.2 S11 (1may)
Tracking Status
firefox40 --- fixed

People

(Reporter: tzimmermann, Assigned: tzimmermann)

References

Details

Attachments

(4 files, 3 obsolete files)

BlueZ's implementation of |BluetoothSocket| is the only remaining user of |UnixSocketConsumer|. Since both classes are supposed to be removed in the long run, we should simply merge |UnixSocketConsumer| into BluetoothSocket.
Depends on: 1152694
Just moves code around and renames some classes.
Attachment #8592748 - Flags: review?(btian)
Attachment #8592751 - Flags: review?(kyle) → review+
Attachment #8592750 - Flags: review?(allstars.chh) → review+
Comment on attachment 8592748 [details] [diff] [review]
[01] Bug 1154281: Merge |UnixSocketConsumer| into |BluetoothSocket|

Review of attachment 8592748 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with nit addressed.

::: dom/bluetooth/bluez/BluetoothSocket.cpp
@@ +12,3 @@
>  #include "nsThreadUtils.h"
> +#include "nsXULAppAPI.h"
> +#include "mozilla/unused.h"

nit: alphabetical order
Attachment #8592748 - Flags: review?(btian) → review+
Comment on attachment 8592749 [details] [diff] [review]
[02] Bug 1154281: Remove references to UnixSocket.h from Bluetooth

Review of attachment 8592749 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with comment addressed.

::: dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h
@@ +13,2 @@
>  namespace dom {
>  namespace bluetooth {

Replace with |BEGIN_BLUETOOTH_NAMESPACE|.

::: dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h
@@ +13,2 @@
>  namespace dom {
>  namespace bluetooth {

Ditto.
Attachment #8592749 - Flags: review?(btian) → review+
Changes since v1:

  - sort include statements alphabetically
Attachment #8592748 - Attachment is obsolete: true
Attachment #8595186 - Flags: review+
Changes since v1:

  - using namespace macros
Attachment #8592749 - Attachment is obsolete: true
Attachment #8595187 - Flags: review+
Changes since v2

  - rebased onto bug 1155718
Attachment #8595187 - Attachment is obsolete: true
You need to log in before you can comment on or make changes to this bug.