Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 2: Change mozilla::dom::telephony to mozilla::dom::gonk for dom/system/gonk objects; r=bent

dom/sms/src/ril/SmsService.cpp

@@ -41,7 +41,7 @@
 #include "jsapi.h"
 #include "nsIInterfaceRequestorUtils.h"
 
-using mozilla::dom::telephony::SystemWorkerManager;
+using mozilla::dom::gonk::SystemWorkerManager;
 
 namespace mozilla {
 namespace dom {

dom/system/gonk/AudioManager.cpp

@@ -38,7 +38,7 @@
 #include "AudioManager.h"
 #include <media/AudioSystem.h>
 
-using namespace mozilla::dom::telephony;
+using namespace mozilla::dom::gonk;
 using namespace android;
 
 NS_IMPL_ISUPPORTS1(AudioManager, nsIAudioManager)

dom/system/gonk/AudioManager.h

@@ -48,7 +48,7 @@
 
 namespace mozilla {
 namespace dom {
-namespace telephony {
+namespace gonk {
 
 class AudioManager : public nsIAudioManager
 {

dom/system/gonk/SystemWorkerManager.cpp

@@ -55,8 +55,9 @@
 #include "nsRadioInterfaceLayer.h"
 #include "nsWifiWorker.h"
 
-USING_TELEPHONY_NAMESPACE
+
 USING_WORKERS_NAMESPACE
+using namespace mozilla::dom::gonk;
 using namespace mozilla::ipc;
 
 namespace {

dom/system/gonk/SystemWorkerManager.h

@@ -40,14 +40,20 @@
 #ifndef mozilla_dom_system_b2g_systemworkermanager_h__
 #define mozilla_dom_system_b2g_systemworkermanager_h__
 
-#include "TelephonyCommon.h"
-
 #include "nsIInterfaceRequestor.h"
 #include "nsIObserver.h"
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsDOMEventTargetHelper.h"
+#include "nsStringGlue.h"
+#include "nsTArray.h"
 
 class nsIWorkerHolder;
 
-BEGIN_TELEPHONY_NAMESPACE
+namespace mozilla {
+namespace dom {
+namespace gonk {
 
 class SystemWorkerManager : public nsIObserver,
                             public nsIInterfaceRequestor
@@ -79,6 +85,8 @@ private:
   bool mShutdown;
 };
 
-END_TELEPHONY_NAMESPACE
+}
+}
+}
 
 #endif // mozilla_dom_system_b2g_systemworkermanager_h__

dom/telephony/Telephony.cpp

@@ -58,6 +58,7 @@
 #include "TelephonyCall.h"
 
 USING_TELEPHONY_NAMESPACE
+using namespace mozilla::dom::gonk;
 using mozilla::Preferences;
 
 #define DOM_TELEPHONY_APP_PHONE_URL_PREF "dom.telephony.app.phone.url"

layout/build/nsLayoutModule.cpp

@@ -129,7 +129,7 @@ using mozilla::dom::DOMRequestService;
 
 #ifdef MOZ_B2G_RIL
 #include "SystemWorkerManager.h"
-using mozilla::dom::telephony::SystemWorkerManager;
+using mozilla::dom::gonk::SystemWorkerManager;
 #define SYSTEMWORKERMANAGER_CID \
   {0xd53b6524, 0x6ac3, 0x42b0, {0xae, 0xca, 0x62, 0xb3, 0xc4, 0xe5, 0x2b, 0x04}}
 #define SYSTEMWORKERMANAGER_CONTRACTID \
@@ -138,7 +138,7 @@ using mozilla::dom::telephony::SystemWorkerManager;
 
 #ifdef MOZ_WIDGET_GONK
 #include "AudioManager.h"
-using mozilla::dom::telephony::AudioManager;
+using mozilla::dom::gonk::AudioManager;
 #endif
 
 // Editor stuff