Bug 1435197 - Reduce the number of headers included in WorkerCommon.h, r=smaug

dom/serviceworkers/ServiceWorkerDescriptor.h

@@ -6,6 +6,8 @@
 #ifndef _mozilla_dom_ServiceWorkerDescriptor_h
 #define _mozilla_dom_ServiceWorkerDescriptor_h
 
+#include "nsString.h"
+
 class nsIPrincipal;
 
 namespace mozilla {

dom/workers/RuntimeService.h

@@ -13,6 +13,7 @@
 
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/workerinternals/JSSettings.h"
+#include "mozilla/Mutex.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"

dom/workers/WorkerCommon.h

@@ -9,30 +9,13 @@
 
 #include "jsapi.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/Mutex.h"
-#include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsTArray.h"
-
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
 
-class nsIGlobalObject;
 class nsPIDOMWindowInner;
 
 namespace mozilla {
 namespace dom {
 
-// If you change this, the corresponding list in nsIWorkerDebugger.idl needs to
-// be updated too.
-enum WorkerType
-{
-  WorkerTypeDedicated,
-  WorkerTypeShared,
-  WorkerTypeService
-};
-
 class WorkerPrivate;
 
 namespace workers {

dom/workers/WorkerPrivate.h

@@ -10,10 +10,8 @@
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/CondVar.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "nsDOMNavigationTiming.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIEventTarget.h"
-#include "nsThreadUtils.h"
 #include "nsTObserverArray.h"
 
 #include "mozilla/dom/WorkerHolder.h"
@@ -31,6 +29,15 @@ class nsIThreadInternal;
 namespace mozilla {
 namespace dom {
 
+// If you change this, the corresponding list in nsIWorkerDebugger.idl needs
+// to be updated too.
+enum WorkerType
+{
+  WorkerTypeDedicated,
+  WorkerTypeShared,
+  WorkerTypeService
+};
+
 class ClientInfo;
 class ClientSource;
 class Function;