Bug 1399787 - Part 1. Fix namespacing and include issues hidden by unified compilation. r=jwatt

We will create several new files in the following patches for IPC and a new
subprocess. Several already existed files will be shifted into new build units,
we will meet several compile errors because of it.

This patch fixes those compile error in advance.

MozReview-Commit-ID: 5hd0sNYfBu0

--HG--
extra : rebase_source : b6b8b069f8f2167ef87266ba9c95e8fe53cca6f6

gfx/thebes/gfxFontSrcPrincipal.cpp

@@ -7,6 +7,9 @@
 
 #include "nsProxyRelease.h"
 #include "nsURIHashKey.h"
+#include "mozilla/BasePrincipal.h"
+
+using mozilla::BasePrincipal;
 
 gfxFontSrcPrincipal::gfxFontSrcPrincipal(nsIPrincipal* aPrincipal)
 {

widget/nsBaseClipboard.h

@@ -40,7 +40,6 @@ protected:
   bool                mIgnoreEmptyNotification;
   nsCOMPtr<nsIClipboardOwner> mClipboardOwner;
   nsCOMPtr<nsITransferable>   mTransferable;
-
 };
 
 #endif // nsBaseClipboard_h__

widget/windows/InkCollector.h

@@ -64,7 +64,7 @@ public:
   void SetPointerId(uint16_t aPointerId);
   void ClearPointerId();
 
-  static StaticAutoPtr<InkCollector> sInkCollector;
+  static mozilla::StaticAutoPtr<InkCollector> sInkCollector;
 
 protected:
   void Initialize();

widget/windows/ScreenHelperWin.cpp

@@ -10,7 +10,7 @@
 #include "nsTArray.h"
 #include "WinUtils.h"
 
-static LazyLogModule sScreenLog("WidgetScreen");
+static mozilla::LazyLogModule sScreenLog("WidgetScreen");
 
 namespace mozilla {
 namespace widget {

widget/windows/nsColorPicker.cpp

@@ -12,6 +12,7 @@
 #include "nsIWidget.h"
 #include "nsString.h"
 #include "WidgetUtils.h"
+#include "nsPIDOMWindow.h"
 
 using namespace mozilla::widget;
 

widget/windows/nsDataObj.cpp

@@ -34,6 +34,7 @@
 #include "nsIContentPolicy.h"
 #include "nsContentUtils.h"
 #include "nsIPrincipal.h"
+#include "nsNativeCharsetUtils.h"
 
 #include "WinUtils.h"
 #include "mozilla/LazyIdleThread.h"

widget/windows/nsDeviceContextSpecWin.cpp

@@ -38,6 +38,9 @@
 #include "mozilla/gfx/PrintTargetSkPDF.h"
 #include "nsIUUIDGenerator.h"
 #include "mozilla/widget/PDFViaEMFPrintHelper.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsPrintfCString.h"
+#include "nsThreadUtils.h"
 #endif
 
 static mozilla::LazyLogModule kWidgetPrintingLogMod("printing-widget");

widget/windows/nsSound.cpp

@@ -28,6 +28,7 @@
 #include "nsNativeCharsetUtils.h"
 #include "nsThreadUtils.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "gfxPlatform.h"
 
 using mozilla::LogLevel;
 
@@ -92,7 +93,7 @@ nsSound::GetInstance()
 {
   if (!sInstance) {
     if (gfxPlatform::IsHeadless()) {
-      sInstance = new widget::HeadlessSound();
+      sInstance = new mozilla::widget::HeadlessSound();
     } else {
       RefPtr<nsSound> sound = new nsSound();
       nsresult rv = sound->CreatePlayerThread();