Per bug 1192693 comment 9, we should discuss how to relocate files under dom/bluetooth/bluetooth2. I have 3 options now: 1) Move to dom/bluetooth: The legacy location. Cons - many files under dom/bluetooth, looks messy. 2) Move to dom/bluetooth/common: Move common files used by both backends under this folder. Pros - more organized. 3) Leave them under dom/bluetooth/bluetooth2: Pros - in case we'll re-design connection & profile related API, we can create another folder to isolate new implementation as bluetooth2.

Jocelyn & Thomas, any thoughts on comment 1? More options are welcome.

(In reply to Ben Tian [:btian] from comment #1) > Jocelyn & Thomas, any thoughts on comment 1? More options are welcome. Should be comment 0.

I'd not go for option 1 for the reason you mention. How about renaming 'bluetooth2' to something like 'webapi' or 'dom'?

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #3) > I'd not go for option 1 for the reason you mention. How about renaming > 'bluetooth2' to something like 'webapi' or 'dom'? I prefer 'webapi' to 'dom' since 'dom' is ambiguous with that in 'dom/bluetooth'. Then should we move out files NOT for webapi (BluetoothService/RilListener/ReplyRunnable/ProfileController)?

(In reply to Ben Tian [:btian] from comment #4) > (In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #3) > > I'd not go for option 1 for the reason you mention. How about renaming > > 'bluetooth2' to something like 'webapi' or 'dom'? > > I prefer 'webapi' to 'dom' since 'dom' is ambiguous with that in > 'dom/bluetooth'. Then should we move out files NOT for webapi > (BluetoothService/RilListener/ReplyRunnable/ProfileController)? Agreed 'dom' is ambiguous here. I think we should move out those files and ipc, test folders. 3): 'bluetooth2' looks like a strange folder to me and may confuse people who are not familiar with our module.

(In reply to Jocelyn Liu [:jocelyn] [:joliu] from comment #5) > > I prefer 'webapi' to 'dom' since 'dom' is ambiguous with that in > > 'dom/bluetooth'. Then should we move out files NOT for webapi > > (BluetoothService/RilListener/ReplyRunnable/ProfileController)? > > Agreed 'dom' is ambiguous here. > I think we should move out those files and ipc, test folders. Another option is to have dom/bluetooth/common and dom/bluetooth/common/webapi for the two types of files above.

(In reply to Ben Tian [:btian] from comment #6) > (In reply to Jocelyn Liu [:jocelyn] [:joliu] from comment #5) > > > I prefer 'webapi' to 'dom' since 'dom' is ambiguous with that in > > > 'dom/bluetooth'. Then should we move out files NOT for webapi > > > (BluetoothService/RilListener/ReplyRunnable/ProfileController)? > > > > Agreed 'dom' is ambiguous here. > > I think we should move out those files and ipc, test folders. > > Another option is to have dom/bluetooth/common and > dom/bluetooth/common/webapi for the two types of files above. IMHO, this option looks better! But for ipc, test folders, how about we put them under dom/bluetooth? My thought is to only see folders (common, bluedroid, bluez, ipc, tests) and moz.build under dom/bluetooth.

I don't have a strong opinion; I'd just like to see 'bluetooth2' be gone. That name only makes sense in the historical context in which it was created.

Comment 7 option seems to be the most acceptable. I'll work toward it on this bug. Thanks for the input!

Also remove redundant BluetoothRilListener.cpp under bluetooth2.

Also revise include file in BluetoothService.h.

Revise testing/marionette/client/marionette/tests/webapi-tests.ini accordingly.

Comment on attachment 8650939 [details] [diff] [review] Patch 1 (v2): Move ipc and tests folders out from dom/bluetooth/bluetooth2 Review of attachment 8650939 [details] [diff] [review]: ----------------------------------------------------------------- Overall looks good to me. Could we also revise the file name for our marionette tests? (ex: s/test_dom_BluetoothAdapter_discovery_API2.js/test_dom_BluetoothAdapter_discovery.js) Also, revise the file list in dom/bluetooth/tests/marionette/manifest.ini.

Rename marionette test js files per reviewer's comment.

Comment on attachment 8650892 [details] [diff] [review] [final] Patch 3: Move backend-neutral files into dom/bluetooth/common, r=joliu Review of attachment 8650892 [details] [diff] [review]: ----------------------------------------------------------------- ::: dom/bluetooth/moz.build @@ +7,5 @@ > if CONFIG['MOZ_B2G_BT']: > > # > # Generic code > # Please remove these three comment lines.

(In reply to Jocelyn Liu [:jocelyn] [:joliu] from comment #18) > Comment on attachment 8650892 [details] [diff] [review] > Patch 3 (v1): Move backend-neutral files into dom/bluetooth/common > > Review of attachment 8650892 [details] [diff] [review]: > ----------------------------------------------------------------- > > ::: dom/bluetooth/moz.build > @@ +7,5 @@ > > if CONFIG['MOZ_B2G_BT']: > > > > # > > # Generic code > > # > > Please remove these three comment lines. The generic code follow below; in contrast to the backend code, which is specified elsewhere in the file.

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #19) > (In reply to Jocelyn Liu [:jocelyn] [:joliu] from comment #18) > > Comment on attachment 8650892 [details] [diff] [review] > > Patch 3 (v1): Move backend-neutral files into dom/bluetooth/common > > > > Review of attachment 8650892 [details] [diff] [review]: > > ----------------------------------------------------------------- > > > > ::: dom/bluetooth/moz.build > > @@ +7,5 @@ > > > if CONFIG['MOZ_B2G_BT']: > > > > > > # > > > # Generic code > > > # > > > > Please remove these three comment lines. > > The generic code follow below; in contrast to the backend code, which is > specified elsewhere in the file. You were right. Thanks for the comment. :) Ben, Sorry for my misunderstanding, please keep them, thanks.

try with more tests: https://treeherder.mozilla.org/#/jobs?repo=try&revision=e78d14211ee3

https://hg.mozilla.org/integration/b2g-inbound/rev/a619abf20603 https://hg.mozilla.org/integration/b2g-inbound/rev/a07c01c0ae44 https://hg.mozilla.org/integration/b2g-inbound/rev/e85b1e693e3f https://hg.mozilla.org/integration/b2g-inbound/rev/eaf58bf9b753 https://hg.mozilla.org/integration/b2g-inbound/rev/4a8baa5e1cf4

Resolve fixed since all commits have been landed to m-c. http://hg.mozilla.org/mozilla-central/rev/a619abf20603 http://hg.mozilla.org/mozilla-central/rev/a07c01c0ae44 http://hg.mozilla.org/mozilla-central/rev/e85b1e693e3f http://hg.mozilla.org/mozilla-central/rev/eaf58bf9b753 http://hg.mozilla.org/mozilla-central/rev/4a8baa5e1cf4

https://hg.mozilla.org/mozilla-central/rev/a619abf20603 https://hg.mozilla.org/mozilla-central/rev/a07c01c0ae44 https://hg.mozilla.org/mozilla-central/rev/e85b1e693e3f https://hg.mozilla.org/mozilla-central/rev/eaf58bf9b753 https://hg.mozilla.org/mozilla-central/rev/4a8baa5e1cf4