Backed out changeset eed2f616bc3e (bug 1063304)

dom/ipc/ContentChild.cpp

@@ -126,7 +126,6 @@
 #include "ipc/Nuwa.h"
 #endif
 
-#include "mozilla/dom/mobileconnection/MobileConnectionChild.h"
 #include "mozilla/dom/mobilemessage/SmsChild.h"
 #include "mozilla/dom/devicestorage/DeviceStorageRequestChild.h"
 #include "mozilla/dom/PFileSystemRequestChild.h"
@@ -155,13 +154,17 @@
 #include "mozilla/net/NeckoMessageUtils.h"
 #include "mozilla/RemoteSpellCheckEngineChild.h"
 
+#ifdef MOZ_B2G_RIL
+#include "mozilla/dom/mobileconnection/MobileConnectionChild.h"
+using namespace mozilla::dom::mobileconnection;
+#endif
+
 using namespace base;
 using namespace mozilla;
 using namespace mozilla::docshell;
 using namespace mozilla::dom::bluetooth;
 using namespace mozilla::dom::devicestorage;
 using namespace mozilla::dom::ipc;
-using namespace mozilla::dom::mobileconnection;
 using namespace mozilla::dom::mobilemessage;
 using namespace mozilla::dom::telephony;
 using namespace mozilla::hal_sandbox;

dom/ipc/ContentParent.cpp

@@ -44,11 +44,10 @@
 #include "mozilla/dom/devicestorage/DeviceStorageRequestParent.h"
 #include "mozilla/dom/FileSystemRequestParent.h"
 #include "mozilla/dom/GeolocationBinding.h"
-#include "mozilla/dom/mobileconnection/MobileConnectionParent.h"
-#include "mozilla/dom/mobilemessage/SmsParent.h"
 #include "mozilla/dom/quota/QuotaManager.h"
 #include "mozilla/dom/telephony/TelephonyParent.h"
 #include "mozilla/dom/time/DateCacheCleaner.h"
+#include "SmsParent.h"
 #include "mozilla/hal_sandbox/PHalParent.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundParent.h"
@@ -178,6 +177,10 @@ using namespace mozilla::system;
 #include "nsIIPCBackgroundChildCreateCallback.h"
 #endif
 
+#ifdef MOZ_B2G_RIL
+#include "mozilla/dom/mobileconnection/MobileConnectionParent.h"
+using namespace mozilla::dom::mobileconnection;
+#endif
 
 #if defined(MOZ_CONTENT_SANDBOX) && defined(XP_LINUX)
 #include "mozilla/Sandbox.h"
@@ -192,7 +195,6 @@ using namespace mozilla::dom::bluetooth;
 using namespace mozilla::dom::devicestorage;
 using namespace mozilla::dom::indexedDB;
 using namespace mozilla::dom::power;
-using namespace mozilla::dom::mobileconnection;
 using namespace mozilla::dom::mobilemessage;
 using namespace mozilla::dom::telephony;
 using namespace mozilla::hal;

dom/mobileconnection/DOMMMIError.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/DOMMMIError.h"
+#include "DOMMMIError.h"
 #include "mozilla/dom/DOMMMIErrorBinding.h"
 
 using namespace mozilla::dom;

dom/mobileconnection/MobileCellInfo.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/MobileCellInfo.h"
+#include "MobileCellInfo.h"
 #include "mozilla/dom/MozMobileCellInfoBinding.h"
 
 using namespace mozilla::dom;

dom/mobileconnection/MobileConnection.cpp

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/MobileConnection.h"
+#include "MobileConnection.h"
 
 #include "MobileConnectionCallback.h"
 #include "mozilla/dom/CFStateChangeEvent.h"
@@ -42,7 +42,6 @@
 
 using mozilla::ErrorResult;
 using namespace mozilla::dom;
-using namespace mozilla::dom::mobileconnection;
 
 class MobileConnection::Listener MOZ_FINAL : public nsIMobileConnectionListener
 {

dom/mobileconnection/MobileConnection.h

@@ -5,10 +5,10 @@
 #ifndef mozilla_dom_MobileConnection_h
 #define mozilla_dom_MobileConnection_h
 
+#include "MobileConnectionInfo.h"
+#include "MobileNetworkInfo.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/dom/DOMRequest.h"
-#include "mozilla/dom/MobileConnectionInfo.h"
-#include "mozilla/dom/MobileNetworkInfo.h"
 #include "mozilla/dom/MozMobileConnectionBinding.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIMobileConnectionService.h"

dom/mobileconnection/MobileConnectionArray.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/MobileConnectionArray.h"
+#include "MobileConnectionArray.h"
 #include "mozilla/dom/MozMobileConnectionArrayBinding.h"
 #include "mozilla/Preferences.h"
 

dom/mobileconnection/MobileConnectionArray.h

@@ -7,8 +7,8 @@
 #ifndef mozilla_dom_network_MobileConnectionArray_h__
 #define mozilla_dom_network_MobileConnectionArray_h__
 
-#include "mozilla/dom/MobileConnection.h"
 #include "nsWrapperCache.h"
+#include "MobileConnection.h"
 
 namespace mozilla {
 namespace dom {

dom/mobileconnection/MobileConnectionCallback.cpp

@@ -4,16 +4,14 @@
 
 #include "MobileConnectionCallback.h"
 
-#include "mozilla/dom/DOMMMIError.h"
+#include "DOMMMIError.h"
 #include "mozilla/dom/MobileNetworkInfo.h"
 #include "mozilla/dom/MozMobileConnectionBinding.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "nsJSUtils.h"
 #include "nsServiceManagerUtils.h"
 
-namespace mozilla {
-namespace dom {
-namespace mobileconnection {
+using namespace mozilla::dom;
 
 NS_IMPL_ISUPPORTS(MobileConnectionCallback, nsIMobileConnectionCallback)
 
@@ -319,7 +317,3 @@ MobileConnectionCallback::NotifyError(const nsAString& aName,
 
   return NS_ERROR_FAILURE;
 }
-
-} // namespace mobileconnection
-} // namespace dom
-} // namespace mozilla

dom/mobileconnection/MobileConnectionCallback.h

@@ -2,17 +2,16 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_dom_mobileconnection_MobileConnectionCallback_h
-#define mozilla_dom_mobileconnection_MobileConnectionCallback_h
+#ifndef mozilla_dom_MobileConnectionCallback_h
+#define mozilla_dom_MobileConnectionCallback_h
 
 #include "mozilla/dom/DOMRequest.h"
-#include "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h"
+#include "mozilla/dom/MobileConnectionIPCSerializer.h"
 #include "nsCOMPtr.h"
 #include "nsIMobileConnectionService.h"
 
 namespace mozilla {
 namespace dom {
-namespace mobileconnection {
 
 /**
  * A callback object for handling asynchronous request/response. This object is
@@ -73,8 +72,7 @@ private:
   nsRefPtr<DOMRequest> mRequest;
 };
 
-} // namespace mobileconnection
-} // namespace dom
-} // namespace mozilla
+} // name space dom
+} // name space mozilla
 
-#endif // mozilla_dom_mobileconnection_MobileConnectionCallback_h
+#endif // mozilla_dom_MobileConnectionCallback_h

dom/mobileconnection/MobileConnectionInfo.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/MobileConnectionInfo.h"
+#include "MobileConnectionInfo.h"
 
 #include "mozilla/dom/ScriptSettings.h"
 

dom/mobileconnection/MobileConnectionInfo.h

@@ -7,8 +7,8 @@
 #ifndef mozilla_dom_MobileConnectionInfo_h
 #define mozilla_dom_MobileConnectionInfo_h
 
-#include "mozilla/dom/MobileCellInfo.h"
-#include "mozilla/dom/MobileNetworkInfo.h"
+#include "MobileCellInfo.h"
+#include "MobileNetworkInfo.h"
 #include "mozilla/dom/MozMobileConnectionInfoBinding.h"
 #include "nsIMobileConnectionInfo.h"
 #include "nsPIDOMWindow.h"

dom/mobileconnection/MobileNetworkInfo.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/MobileNetworkInfo.h"
+#include "MobileNetworkInfo.h"
 
 using namespace mozilla::dom;
 

dom/mobileconnection/ipc/MobileConnectionChild.cpp

@@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/mobileconnection/MobileConnectionChild.h"
+#include "MobileConnectionChild.h"
 
 #include "MobileConnectionCallback.h"
 #include "mozilla/dom/MozMobileConnectionBinding.h"

dom/mobileconnection/ipc/MobileConnectionChild.h

@@ -5,16 +5,15 @@
 #ifndef mozilla_dom_mobileconnection_MobileConnectionChild_h
 #define mozilla_dom_mobileconnection_MobileConnectionChild_h
 
+#include "mozilla/dom/MobileConnectionCallback.h"
 #include "mozilla/dom/MobileConnectionInfo.h"
-#include "mozilla/dom/mobileconnection/PMobileConnectionChild.h"
-#include "mozilla/dom/mobileconnection/PMobileConnectionRequestChild.h"
+#include "mozilla/dom/PMobileConnectionChild.h"
+#include "mozilla/dom/PMobileConnectionRequestChild.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 #include "nsIMobileConnectionService.h"
 #include "nsIVariant.h"
 
-class nsIMobileConnectionCallback;
-
 namespace mozilla {
 namespace dom {
 namespace mobileconnection {

dom/mobileconnection/ipc/MobileConnectionIPCSerializer.h

@@ -2,14 +2,14 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_dom_mobileconnection_MobileConnectionIPCSerialiser_h
-#define mozilla_dom_mobileconnection_MobileConnectionIPCSerialiser_h
+#ifndef dom_mobileconnection_src_ipc_MobileConnectionIPCSerialiser_h
+#define dom_mobileconnection_src_ipc_MobileConnectionIPCSerialiser_h
 
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/dom/MobileCellInfo.h"
 #include "mozilla/dom/MobileConnectionInfo.h"
 #include "mozilla/dom/MobileNetworkInfo.h"
-#include "mozilla/dom/MozMobileConnectionBinding.h"
+#include "MozMobileConnectionBinding.h"
 
 using mozilla::AutoSafeJSContext;
 using mozilla::dom::MobileNetworkInfo;
@@ -746,4 +746,4 @@ struct ParamTraits<MozCallBarringOptions>
 
 } // namespace IPC
 
-#endif // mozilla_dom_mobileconnection_MobileConnectionIPCSerialiser_h
+#endif // dom_mobileconnection_src_ipc_MobileConnectionIPCSerialiser_h

dom/mobileconnection/ipc/MobileConnectionIPCService.h

@@ -6,7 +6,7 @@
 #define mozilla_dom_mobileconnection_MobileConnectionIPCService_h
 
 #include "nsCOMPtr.h"
-#include "mozilla/dom/mobileconnection/MobileConnectionChild.h"
+#include "MobileConnectionChild.h"
 #include "nsIMobileConnectionService.h"
 
 namespace mozilla {
@@ -35,8 +35,8 @@ private:
   nsTArray<nsRefPtr<MobileConnectionChild>> mClients;
 };
 
-} // namespace mobileconnection
-} // namespace dom
-} // namespace mozilla
+} // name space mobileconnection
+} // name space dom
+} // name space mozilla
 
 #endif // mozilla_dom_mobileconnection_MobileConnectionIPCService_h

dom/mobileconnection/ipc/MobileConnectionParent.cpp

@@ -2,11 +2,11 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/mobileconnection/MobileConnectionParent.h"
+#include "MobileConnectionParent.h"
 
 #include "mozilla/AppProcessChecker.h"
 #include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h"
+#include "mozilla/dom/MobileConnectionIPCSerializer.h"
 #include "mozilla/dom/MozMobileConnectionBinding.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "nsIVariant.h"

dom/mobileconnection/ipc/MobileConnectionParent.h

@@ -5,8 +5,8 @@
 #ifndef mozilla_dom_mobileconnection_MobileConnectionParent_h
 #define mozilla_dom_mobileconnection_MobileConnectionParent_h
 
-#include "mozilla/dom/mobileconnection/PMobileConnectionParent.h"
-#include "mozilla/dom/mobileconnection/PMobileConnectionRequestParent.h"
+#include "mozilla/dom/PMobileConnectionParent.h"
+#include "mozilla/dom/PMobileConnectionRequestParent.h"
 #include "nsIMobileConnectionInfo.h"
 #include "nsIMobileConnectionService.h"
 #include "nsServiceManagerUtils.h"

dom/mobileconnection/ipc/PMobileConnection.ipdl

@@ -10,7 +10,6 @@ include PMobileConnectionTypes;
 
 namespace mozilla {
 namespace dom {
-namespace mobileconnection {
 
 sync protocol PMobileConnection
 {
@@ -185,6 +184,5 @@ union MobileConnectionRequest
   SetRadioEnabledRequest;
 };
 
-} // namespace mobileconnection
-} // namespace dom
 } // namespace mozilla
+} // namespace dom

dom/mobileconnection/ipc/PMobileConnectionRequest.ipdl

@@ -9,7 +9,6 @@ include PMobileConnectionTypes;
 
 namespace mozilla {
 namespace dom {
-namespace mobileconnection {
 
 protocol PMobileConnectionRequest
 {
@@ -100,6 +99,5 @@ union MobileConnectionReply
   MobileConnectionReplyErrorMmi;
 };
 
-} // namespace mobileconnection
 } // namespace dom
 } // namespace mozilla

dom/mobileconnection/ipc/PMobileConnectionTypes.ipdlh

@@ -4,15 +4,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-using nsMobileConnectionInfo from "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h";
-using nsMobileNetworkInfo from "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h";
+using nsMobileConnectionInfo from "mozilla/dom/MobileConnectionIPCSerializer.h";
+using nsMobileNetworkInfo from "mozilla/dom/MobileConnectionIPCSerializer.h";
 using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using struct IPC::MozCallForwardingOptions from "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h";
-using struct IPC::MozCallBarringOptions from "mozilla/dom/mobileconnection/MobileConnectionIPCSerializer.h";
+using struct IPC::MozCallForwardingOptions from "mozilla/dom/MobileConnectionIPCSerializer.h";
+using struct IPC::MozCallBarringOptions from "mozilla/dom/MobileConnectionIPCSerializer.h";
 
 namespace mozilla {
 namespace dom {
-namespace mobileconnection {
 
 union AdditionalInformation {
   void_t;
@@ -21,6 +20,5 @@ union AdditionalInformation {
   MozCallForwardingOptions[];
 };
 
-} // namespace mobileconnection
 } // namespace dom
 } // namespace mozilla

dom/mobileconnection/moz.build

@@ -8,16 +8,17 @@ MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 
 EXPORTS.mozilla.dom += [
     'DOMMMIError.h',
+    'ipc/MobileConnectionIPCSerializer.h',
     'MobileCellInfo.h',
     'MobileConnection.h',
     'MobileConnectionArray.h',
+    'MobileConnectionCallback.h',
     'MobileConnectionInfo.h',
     'MobileNetworkInfo.h',
 ]
 
 EXPORTS.mozilla.dom.mobileconnection += [
     'ipc/MobileConnectionChild.h',
-    'ipc/MobileConnectionIPCSerializer.h',
     'ipc/MobileConnectionIPCService.h',
     'ipc/MobileConnectionParent.h',
 ]