1154281 - Merge |UnixSocketConsumer| into |BluetoothSocket|

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Bluetooth, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

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.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [01] Bug 1154281: Merge |UnixSocketConsumer| into |BluetoothSocket|

Just moves code around and renames some classes.

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [02] Bug 1154281: Remove references to UnixSocket.h from Bluetooth

Comment 3

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [03] Bug 1154281: Don't include UnixSocket.h in NFC

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [04] Bug 1154281: Remove |UnixSocketConsumer| and its helpers

Comment 5

[Ben Tian (inactive)]

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

Comment 6

[Ben Tian (inactive)]

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.

Comment 7

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=0a53885b4722

Comment 8

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [01] Bug 1154281: Merge |UnixSocketConsumer| into |BluetoothSocket| (v2)

Changes since v1:

  - sort include statements alphabetically

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [02] Bug 1154281: Remove references to UnixSocket.h from Bluetooth (v2)

Changes since v1:

  - using namespace macros

Comment 10

[Pulsebot]

https://hg.mozilla.org/integration/b2g-inbound/rev/d2c32fcc1b38
https://hg.mozilla.org/integration/b2g-inbound/rev/995b1851e85a
https://hg.mozilla.org/integration/b2g-inbound/rev/07ac5145c108
https://hg.mozilla.org/integration/b2g-inbound/rev/076bddb037ea

Comment 11

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [02] Bug 1154281: Remove references to UnixSocket.h from Bluetooth (v3)

Changes since v2

  - rebased onto bug 1155718

Comment 12

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Thanks everyone.

https://treeherder.mozilla.org/#/jobs?repo=b2g-inbound&revision=076bddb037ea

Comment 13

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d2c32fcc1b38
https://hg.mozilla.org/mozilla-central/rev/995b1851e85a
https://hg.mozilla.org/mozilla-central/rev/07ac5145c108
https://hg.mozilla.org/mozilla-central/rev/076bddb037ea