Backed out changeset a6e627eff6a6 (bug 1001691)

dom/workers/RuntimeService.h

@@ -8,6 +8,7 @@
 #define mozilla_dom_workers_runtimeservice_h__
 
 #include "Workers.h"
+#include "WorkerPrivate.h" // For the WorkerType enum.
 
 #include "nsIObserver.h"
 
@@ -15,6 +16,7 @@
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
+#include "WorkerPrivate.h"
 
 class nsIRunnable;
 class nsITimer;

dom/workers/WorkerPrivate.h

@@ -68,6 +68,15 @@ class WorkerPrivate;
 class WorkerRunnable;
 class WorkerThread;
 
+// If you change this, the corresponding list in nsIWorkerDebugger.idl needs to
+// be updated too.
+enum WorkerType
+{
+  WorkerTypeDedicated,
+  WorkerTypeShared,
+  WorkerTypeService
+};
+
 // SharedMutex is a small wrapper around an (internal) reference-counted Mutex
 // object. It exists to avoid changing a lot of code to use Mutex* instead of
 // Mutex&.

dom/workers/Workers.h

@@ -42,17 +42,6 @@ namespace mozilla {
 namespace ipc {
 class PrincipalInfo;
 }
-
-namespace dom {
-// If you change this, the corresponding list in nsIWorkerDebugger.idl needs to
-// be updated too.
-enum WorkerType
-{
-  WorkerTypeDedicated,
-  WorkerTypeShared,
-  WorkerTypeService
-};
-}
 }
 
 BEGIN_WORKERS_NAMESPACE