Bug 1193379 - Move ipc and tests folders out from dom/bluetooth/bluetooth2. r=joliu

--HG--
rename : dom/bluetooth/bluetooth2/ipc/BluetoothChild.cpp => dom/bluetooth/ipc/BluetoothChild.cpp
rename : dom/bluetooth/bluetooth2/ipc/BluetoothChild.h => dom/bluetooth/ipc/BluetoothChild.h
rename : dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h => dom/bluetooth/ipc/BluetoothMessageUtils.h
rename : dom/bluetooth/bluetooth2/ipc/BluetoothParent.cpp => dom/bluetooth/ipc/BluetoothParent.cpp
rename : dom/bluetooth/bluetooth2/ipc/BluetoothParent.h => dom/bluetooth/ipc/BluetoothParent.h
rename : dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp => dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
rename : dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h => dom/bluetooth/ipc/BluetoothServiceChildProcess.h
rename : dom/bluetooth/bluetooth2/ipc/BluetoothTypes.ipdlh => dom/bluetooth/ipc/BluetoothTypes.ipdlh
rename : dom/bluetooth/bluetooth2/ipc/PBluetooth.ipdl => dom/bluetooth/ipc/PBluetooth.ipdl
rename : dom/bluetooth/bluetooth2/ipc/PBluetoothRequest.ipdl => dom/bluetooth/ipc/PBluetoothRequest.ipdl
rename : dom/bluetooth/bluetooth2/tests/marionette/head.js => dom/bluetooth/tests/marionette/head.js
rename : dom/bluetooth/bluetooth2/tests/marionette/manifest.ini => dom/bluetooth/tests/marionette/manifest.ini
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothAdapter_discovery_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothAdapter_enable_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_enable.js
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothAdapter_pair_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothAdapter_setters_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothDevice_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothDevice.js
rename : dom/bluetooth/bluetooth2/tests/marionette/test_dom_BluetoothManager_API2.js => dom/bluetooth/tests/marionette/test_dom_BluetoothManager.js

dom/bluetooth/moz.build

@@ -41,13 +41,13 @@ if CONFIG['MOZ_B2G_BT']:
         'bluetooth2/BluetoothProfileController.cpp',
         'bluetooth2/BluetoothReplyRunnable.cpp',
         'bluetooth2/BluetoothService.cpp',
-        'bluetooth2/ipc/BluetoothChild.cpp',
+        'ipc/BluetoothChild.cpp',
-        'bluetooth2/ipc/BluetoothParent.cpp',
+        'ipc/BluetoothParent.cpp',
-        'bluetooth2/ipc/BluetoothServiceChildProcess.cpp',
+        'ipc/BluetoothServiceChildProcess.cpp',
     ]
     LOCAL_INCLUDES += [
         'bluetooth2',
-        'bluetooth2/ipc',
+        'ipc',
     ]
 
     #
@@ -129,7 +129,7 @@ if CONFIG['MOZ_B2G_BT']:
 #
 
 EXPORTS.mozilla.dom.bluetooth.ipc += [
-    'bluetooth2/ipc/BluetoothMessageUtils.h',
+    'ipc/BluetoothMessageUtils.h',
 ]
 EXPORTS.mozilla.dom.bluetooth += [
     'bluetooth2/BluetoothAdapter.h',
@@ -149,9 +149,9 @@ EXPORTS.mozilla.dom.bluetooth += [
     'BluetoothPbapRequestHandle.h',
 ]
 IPDL_SOURCES += [
-    'bluetooth2/ipc/BluetoothTypes.ipdlh',
+    'ipc/BluetoothTypes.ipdlh',
-    'bluetooth2/ipc/PBluetooth.ipdl',
+    'ipc/PBluetooth.ipdl',
-    'bluetooth2/ipc/PBluetoothRequest.ipdl',
+    'ipc/PBluetoothRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True

dom/ipc/moz.build

@@ -130,7 +130,7 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/bluetooth',
     '/dom/bluetooth/bluetooth2',
-    '/dom/bluetooth/bluetooth2/ipc',
+    '/dom/bluetooth/ipc',
     '/dom/devicestorage',
     '/dom/filesystem',
     '/dom/fmradio/ipc',

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

@@ -12,7 +12,7 @@ b2g = true
 skip = false
 
 ; webapi tests
-[include:../../../../../dom/bluetooth/bluetooth2/tests/marionette/manifest.ini]
+[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini]
 [include:../../../../../dom/telephony/test/marionette/manifest.ini]
 [include:../../../../../dom/voicemail/test/marionette/manifest.ini]
 [include:../../../../../dom/battery/test/marionette/manifest.ini]