From 75a685187a0c09cd15f71a617c2c962988ee7945 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Wed, 4 Mar 2015 14:54:16 +0100
Subject: [PATCH] Bug 1001691 - Move WorkerType out of WorkerPrivate.h r=khuey

---
 dom/workers/RuntimeService.h |  2 --
 dom/workers/WorkerPrivate.h  |  9 ---------
 dom/workers/Workers.h        | 11 +++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
index 48acf2acab80..b963a11f5b43 100644
--- a/dom/workers/RuntimeService.h
+++ b/dom/workers/RuntimeService.h
@@ -8,7 +8,6 @@
 #define mozilla_dom_workers_runtimeservice_h__
 
 #include "Workers.h"
-#include "WorkerPrivate.h" // For the WorkerType enum.
 
 #include "nsIObserver.h"
 
@@ -16,7 +15,6 @@
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
-#include "WorkerPrivate.h"
 
 class nsIRunnable;
 class nsITimer;
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 63900b9d6d6e..e1075b9be403 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -69,15 +69,6 @@ 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&.
diff --git a/dom/workers/Workers.h b/dom/workers/Workers.h
index 8826162ce33d..49337e1ee664 100644
--- a/dom/workers/Workers.h
+++ b/dom/workers/Workers.h
@@ -43,6 +43,17 @@ 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