Bug 872091 - Rename files in the debugger server. r=past,r=jimb
authorDave Camp <dcamp@mozilla.com>
Tue, 21 May 2013 16:39:13 -0700
changeset 132531 1c2ca70f459e23d75bcf2499b64120ad26e32841
parent 132530 022074c03e7d907a4280a5acb90e9d602c578342
child 132532 1904eab9bcfb428fc5502c7f1e5c4e8189f6b359
push idunknown
push userunknown
push dateunknown
reviewerspast, jimb
bugs872091
milestone24.0a1
Bug 872091 - Rename files in the debugger server. r=past,r=jimb
b2g/chrome/content/shell.js
testing/xpcshell/xpcshell.ini
toolkit/devtools/Loader.jsm
toolkit/devtools/Makefile.in
toolkit/devtools/client/Makefile.in
toolkit/devtools/client/dbg-client.jsm
toolkit/devtools/client/moz.build
toolkit/devtools/debugger/Makefile.in
toolkit/devtools/debugger/dbg-client.jsm
toolkit/devtools/debugger/dbg-transport.js
toolkit/devtools/debugger/moz.build
toolkit/devtools/debugger/nsIJSInspector.idl
toolkit/devtools/debugger/nsJSInspector.cpp
toolkit/devtools/debugger/nsJSInspector.h
toolkit/devtools/debugger/server/dbg-browser-actors.js
toolkit/devtools/debugger/server/dbg-profiler-actors.js
toolkit/devtools/debugger/server/dbg-script-actors.js
toolkit/devtools/debugger/server/dbg-server.js
toolkit/devtools/debugger/server/dbg-server.jsm
toolkit/devtools/debugger/tests/mochitest/Makefile.in
toolkit/devtools/debugger/tests/mochitest/moz.build
toolkit/devtools/debugger/tests/mochitest/nonchrome_unsafeDereference.html
toolkit/devtools/debugger/tests/mochitest/test_unsafeDereference.html
toolkit/devtools/debugger/tests/moz.build
toolkit/devtools/debugger/tests/unit/head_dbg.js
toolkit/devtools/debugger/tests/unit/post_init_global_actors.js
toolkit/devtools/debugger/tests/unit/post_init_tab_actors.js
toolkit/devtools/debugger/tests/unit/pre_init_global_actors.js
toolkit/devtools/debugger/tests/unit/pre_init_tab_actors.js
toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee
toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map
toolkit/devtools/debugger/tests/unit/sourcemapped.js
toolkit/devtools/debugger/tests/unit/test_add_actors.js
toolkit/devtools/debugger/tests/unit/test_attach.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-01.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-03.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-05.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-06.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-07.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-08.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-09.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-10.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-11.js
toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js
toolkit/devtools/debugger/tests/unit/test_breakpointstore.js
toolkit/devtools/debugger/tests/unit/test_dbgactor.js
toolkit/devtools/debugger/tests/unit/test_dbgclient_debuggerstatement.js
toolkit/devtools/debugger/tests/unit/test_dbgglobal.js
toolkit/devtools/debugger/tests/unit/test_dbgsocket.js
toolkit/devtools/debugger/tests/unit/test_eval-01.js
toolkit/devtools/debugger/tests/unit/test_eval-02.js
toolkit/devtools/debugger/tests/unit/test_eval-03.js
toolkit/devtools/debugger/tests/unit/test_eval-04.js
toolkit/devtools/debugger/tests/unit/test_eval-05.js
toolkit/devtools/debugger/tests/unit/test_frameactor-01.js
toolkit/devtools/debugger/tests/unit/test_frameactor-02.js
toolkit/devtools/debugger/tests/unit/test_frameactor-03.js
toolkit/devtools/debugger/tests/unit/test_frameactor-04.js
toolkit/devtools/debugger/tests/unit/test_frameactor-05.js
toolkit/devtools/debugger/tests/unit/test_framearguments-01.js
toolkit/devtools/debugger/tests/unit/test_framebindings-01.js
toolkit/devtools/debugger/tests/unit/test_framebindings-02.js
toolkit/devtools/debugger/tests/unit/test_framebindings-03.js
toolkit/devtools/debugger/tests/unit/test_framebindings-04.js
toolkit/devtools/debugger/tests/unit/test_framebindings-05.js
toolkit/devtools/debugger/tests/unit/test_framebindings-06.js
toolkit/devtools/debugger/tests/unit/test_frameclient-01.js
toolkit/devtools/debugger/tests/unit/test_frameclient-02.js
toolkit/devtools/debugger/tests/unit/test_functiongrips-01.js
toolkit/devtools/debugger/tests/unit/test_getyoungestframe.js
toolkit/devtools/debugger/tests/unit/test_interrupt.js
toolkit/devtools/debugger/tests/unit/test_listsources-01.js
toolkit/devtools/debugger/tests/unit/test_listsources-02.js
toolkit/devtools/debugger/tests/unit/test_listsources-03.js
toolkit/devtools/debugger/tests/unit/test_longstringactor.js
toolkit/devtools/debugger/tests/unit/test_longstringgrips-01.js
toolkit/devtools/debugger/tests/unit/test_longstringgrips-02.js
toolkit/devtools/debugger/tests/unit/test_nativewrappers.js
toolkit/devtools/debugger/tests/unit/test_new_source-01.js
toolkit/devtools/debugger/tests/unit/test_nsjsinspector.js
toolkit/devtools/debugger/tests/unit/test_objectgrips-01.js
toolkit/devtools/debugger/tests/unit/test_objectgrips-02.js
toolkit/devtools/debugger/tests/unit/test_objectgrips-03.js
toolkit/devtools/debugger/tests/unit/test_objectgrips-04.js
toolkit/devtools/debugger/tests/unit/test_pause_exceptions-01.js
toolkit/devtools/debugger/tests/unit/test_pause_exceptions-02.js
toolkit/devtools/debugger/tests/unit/test_pauselifetime-01.js
toolkit/devtools/debugger/tests/unit/test_pauselifetime-02.js
toolkit/devtools/debugger/tests/unit/test_pauselifetime-03.js
toolkit/devtools/debugger/tests/unit/test_pauselifetime-04.js
toolkit/devtools/debugger/tests/unit/test_profiler_actor.js
toolkit/devtools/debugger/tests/unit/test_source-01.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-06.js
toolkit/devtools/debugger/tests/unit/test_sourcemaps-07.js
toolkit/devtools/debugger/tests/unit/test_sources_backwards_compat-01.js
toolkit/devtools/debugger/tests/unit/test_sources_backwards_compat-02.js
toolkit/devtools/debugger/tests/unit/test_stepping-01.js
toolkit/devtools/debugger/tests/unit/test_stepping-02.js
toolkit/devtools/debugger/tests/unit/test_stepping-03.js
toolkit/devtools/debugger/tests/unit/test_stepping-04.js
toolkit/devtools/debugger/tests/unit/test_stepping-05.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-01.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-02.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-03.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-04.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
toolkit/devtools/debugger/tests/unit/test_threadlifetime-06.js
toolkit/devtools/debugger/tests/unit/test_unsafeDereference.js
toolkit/devtools/debugger/tests/unit/testactors.js
toolkit/devtools/debugger/tests/unit/testcompatactors.js
toolkit/devtools/debugger/tests/unit/xpcshell.ini
toolkit/devtools/gcli/dbg-gcli-actors.js
toolkit/devtools/jar.mn
toolkit/devtools/moz.build
toolkit/devtools/server/Makefile.in
toolkit/devtools/server/actors/gcli.js
toolkit/devtools/server/actors/profiler.js
toolkit/devtools/server/actors/script.js
toolkit/devtools/server/actors/styleeditor.js
toolkit/devtools/server/actors/webbrowser.js
toolkit/devtools/server/actors/webconsole.js
toolkit/devtools/server/dbg-server.jsm
toolkit/devtools/server/main.js
toolkit/devtools/server/moz.build
toolkit/devtools/server/nsIJSInspector.idl
toolkit/devtools/server/nsJSInspector.cpp
toolkit/devtools/server/nsJSInspector.h
toolkit/devtools/server/tests/mochitest/Makefile.in
toolkit/devtools/server/tests/mochitest/moz.build
toolkit/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html
toolkit/devtools/server/tests/mochitest/test_unsafeDereference.html
toolkit/devtools/server/tests/moz.build
toolkit/devtools/server/tests/unit/head_dbg.js
toolkit/devtools/server/tests/unit/post_init_global_actors.js
toolkit/devtools/server/tests/unit/post_init_tab_actors.js
toolkit/devtools/server/tests/unit/pre_init_global_actors.js
toolkit/devtools/server/tests/unit/pre_init_tab_actors.js
toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.coffee
toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.map
toolkit/devtools/server/tests/unit/sourcemapped.js
toolkit/devtools/server/tests/unit/test_add_actors.js
toolkit/devtools/server/tests/unit/test_attach.js
toolkit/devtools/server/tests/unit/test_breakpoint-01.js
toolkit/devtools/server/tests/unit/test_breakpoint-02.js
toolkit/devtools/server/tests/unit/test_breakpoint-03.js
toolkit/devtools/server/tests/unit/test_breakpoint-04.js
toolkit/devtools/server/tests/unit/test_breakpoint-05.js
toolkit/devtools/server/tests/unit/test_breakpoint-06.js
toolkit/devtools/server/tests/unit/test_breakpoint-07.js
toolkit/devtools/server/tests/unit/test_breakpoint-08.js
toolkit/devtools/server/tests/unit/test_breakpoint-09.js
toolkit/devtools/server/tests/unit/test_breakpoint-10.js
toolkit/devtools/server/tests/unit/test_breakpoint-11.js
toolkit/devtools/server/tests/unit/test_breakpoint-12.js
toolkit/devtools/server/tests/unit/test_breakpointstore.js
toolkit/devtools/server/tests/unit/test_dbgactor.js
toolkit/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
toolkit/devtools/server/tests/unit/test_dbgglobal.js
toolkit/devtools/server/tests/unit/test_dbgsocket.js
toolkit/devtools/server/tests/unit/test_eval-01.js
toolkit/devtools/server/tests/unit/test_eval-02.js
toolkit/devtools/server/tests/unit/test_eval-03.js
toolkit/devtools/server/tests/unit/test_eval-04.js
toolkit/devtools/server/tests/unit/test_eval-05.js
toolkit/devtools/server/tests/unit/test_frameactor-01.js
toolkit/devtools/server/tests/unit/test_frameactor-02.js
toolkit/devtools/server/tests/unit/test_frameactor-03.js
toolkit/devtools/server/tests/unit/test_frameactor-04.js
toolkit/devtools/server/tests/unit/test_frameactor-05.js
toolkit/devtools/server/tests/unit/test_framearguments-01.js
toolkit/devtools/server/tests/unit/test_framebindings-01.js
toolkit/devtools/server/tests/unit/test_framebindings-02.js
toolkit/devtools/server/tests/unit/test_framebindings-03.js
toolkit/devtools/server/tests/unit/test_framebindings-04.js
toolkit/devtools/server/tests/unit/test_framebindings-05.js
toolkit/devtools/server/tests/unit/test_framebindings-06.js
toolkit/devtools/server/tests/unit/test_frameclient-01.js
toolkit/devtools/server/tests/unit/test_frameclient-02.js
toolkit/devtools/server/tests/unit/test_functiongrips-01.js
toolkit/devtools/server/tests/unit/test_getyoungestframe.js
toolkit/devtools/server/tests/unit/test_interrupt.js
toolkit/devtools/server/tests/unit/test_listsources-01.js
toolkit/devtools/server/tests/unit/test_listsources-02.js
toolkit/devtools/server/tests/unit/test_listsources-03.js
toolkit/devtools/server/tests/unit/test_longstringactor.js
toolkit/devtools/server/tests/unit/test_longstringgrips-01.js
toolkit/devtools/server/tests/unit/test_longstringgrips-02.js
toolkit/devtools/server/tests/unit/test_nativewrappers.js
toolkit/devtools/server/tests/unit/test_new_source-01.js
toolkit/devtools/server/tests/unit/test_nsjsinspector.js
toolkit/devtools/server/tests/unit/test_objectgrips-01.js
toolkit/devtools/server/tests/unit/test_objectgrips-02.js
toolkit/devtools/server/tests/unit/test_objectgrips-03.js
toolkit/devtools/server/tests/unit/test_objectgrips-04.js
toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
toolkit/devtools/server/tests/unit/test_profiler_actor.js
toolkit/devtools/server/tests/unit/test_source-01.js
toolkit/devtools/server/tests/unit/test_sourcemaps-01.js
toolkit/devtools/server/tests/unit/test_sourcemaps-02.js
toolkit/devtools/server/tests/unit/test_sourcemaps-03.js
toolkit/devtools/server/tests/unit/test_sourcemaps-04.js
toolkit/devtools/server/tests/unit/test_sourcemaps-05.js
toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
toolkit/devtools/server/tests/unit/test_sources_backwards_compat-01.js
toolkit/devtools/server/tests/unit/test_sources_backwards_compat-02.js
toolkit/devtools/server/tests/unit/test_stepping-01.js
toolkit/devtools/server/tests/unit/test_stepping-02.js
toolkit/devtools/server/tests/unit/test_stepping-03.js
toolkit/devtools/server/tests/unit/test_stepping-04.js
toolkit/devtools/server/tests/unit/test_stepping-05.js
toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
toolkit/devtools/server/tests/unit/test_unsafeDereference.js
toolkit/devtools/server/tests/unit/testactors.js
toolkit/devtools/server/tests/unit/testcompatactors.js
toolkit/devtools/server/tests/unit/xpcshell.ini
toolkit/devtools/server/transport.js
toolkit/devtools/styleeditor/Makefile.in
toolkit/devtools/styleeditor/dbg-styleeditor-actors.js
toolkit/devtools/styleeditor/moz.build
toolkit/devtools/webconsole/dbg-webconsole-actors.js
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -999,25 +999,25 @@ let RemoteDebugger = {
     this._promptDone = true;
   },
 
   // Start the debugger server.
   start: function debugger_start() {
     if (!DebuggerServer.initialized) {
       // Ask for remote connections.
       DebuggerServer.init(this.prompt.bind(this));
-      DebuggerServer.addActors("chrome://global/content/devtools/dbg-browser-actors.js");
+      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
 #ifndef MOZ_WIDGET_GONK
-      DebuggerServer.addActors("chrome://global/content/devtools/dbg-webconsole-actors.js");
-      DebuggerServer.addActors("chrome://global/content/devtools/dbg-gcli-actors.js");
+      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
+      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
 #endif
       if ("nsIProfiler" in Ci) {
-        DebuggerServer.addActors("chrome://global/content/devtools/dbg-profiler-actors.js");
+        DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
       }
-      DebuggerServer.addActors("chrome://global/content/devtools/dbg-styleeditor-actors.js");
+      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
       DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
       DebuggerServer.addActors('chrome://browser/content/dbg-webapps-actors.js');
     }
 
     let port = Services.prefs.getIntPref('devtools.debugger.remote-port') || 6000;
     try {
       DebuggerServer.openListener(port);
     } catch (e) {
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -25,17 +25,17 @@
 [include:dom/tests/unit/xpcshell.ini]
 [include:dom/indexedDB/test/unit/xpcshell.ini]
 [include:docshell/test/unit/xpcshell.ini]
 [include:docshell/test/unit_ipc/xpcshell.ini]
 [include:embedding/tests/unit/xpcshell.ini]
 [include:toolkit/components/commandlines/test/unit/xpcshell.ini]
 [include:toolkit/components/contentprefs/tests/unit/xpcshell.ini]
 [include:toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini]
-[include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
+[include:toolkit/devtools/server/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
 [include:toolkit/components/passwordmgr/test/unit/xpcshell.ini]
 # Bug 676989: tests hang on Android
 skip-if = os == "android"
 [include:toolkit/components/places/tests/migration/xpcshell.ini]
 [include:toolkit/components/places/tests/autocomplete/xpcshell.ini]
 [include:toolkit/components/places/tests/inline/xpcshell.ini]
 [include:toolkit/components/places/tests/expiration/xpcshell.ini]
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@@ -71,19 +71,17 @@ var SrcdirProvider = {
         "": "resource://gre/modules/commonjs/",
         "devtools/server": "file://" + serverDir,
         "devtools": "file://" + devtoolsDir,
         "main": "file://" + devtoolsDir + "/main.js"
       },
       globals: loaderGlobals
     });
 
-    return this._writeManifest(devtoolsDir).then((data) => {
-      this._writeManifest(toolkitDir);
-    }).then(null, Cu.reportError);
+    return this._writeManifest(devtoolsDir).then(null, Cu.reportError);
   },
 
   unload: function(reason) {
     loader.unload(this.loader, reason);
     delete this.loader;
   },
 
   _readFile: function(filename) {
--- a/toolkit/devtools/Makefile.in
+++ b/toolkit/devtools/Makefile.in
@@ -7,9 +7,9 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(NSINSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
rename from toolkit/devtools/debugger/Makefile.in
rename to toolkit/devtools/client/Makefile.in
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/client/Makefile.in
@@ -4,29 +4,12 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE_NAME = jsinspector
-
-LIBRARY_NAME = jsinspector
-LIBXUL_LIBRARY = 1
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-
-CPPSRCS = \
-    nsJSInspector.cpp \
-    $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-    $(MOZ_COMPONENT_LIBS) \
-    $(MOZ_JS_LIBS) \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
-	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
rename from toolkit/devtools/debugger/dbg-client.jsm
rename to toolkit/devtools/client/dbg-client.jsm
--- a/toolkit/devtools/debugger/dbg-client.jsm
+++ b/toolkit/devtools/client/dbg-client.jsm
@@ -35,17 +35,17 @@ function dumpn(str)
 {
   if (wantLogging) {
     dump("DBG-CLIENT: " + str + "\n");
   }
 }
 
 let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
   .getService(Ci.mozIJSSubScriptLoader);
-loader.loadSubScript("chrome://global/content/devtools/dbg-transport.js", this);
+loader.loadSubScript("resource://gre/modules/devtools/server/transport.js", this);
 
 /**
  * Add simple event notification to a prototype object. Any object that has
  * some use for event notifications or the observer pattern in general can be
  * augmented with the necessary facilities by passing its prototype to this
  * function.
  *
  * @param aProto object
rename from toolkit/devtools/debugger/moz.build
rename to toolkit/devtools/client/moz.build
--- a/toolkit/devtools/debugger/moz.build
+++ b/toolkit/devtools/client/moz.build
@@ -1,14 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['tests']
 
-XPIDL_SOURCES += [
-    'nsIJSInspector.idl',
-]
-
-MODULE = 'jsinspector'
-
deleted file mode 100644
--- a/toolkit/devtools/jar.mn
+++ /dev/null
@@ -1,13 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-  content/global/devtools/dbg-transport.js        (debugger/dbg-transport.js)
-  content/global/devtools/dbg-server.js           (debugger/server/dbg-server.js)
-  content/global/devtools/dbg-script-actors.js    (debugger/server/dbg-script-actors.js)
-  content/global/devtools/dbg-browser-actors.js   (debugger/server/dbg-browser-actors.js)
-  content/global/devtools/dbg-gcli-actors.js      (gcli/dbg-gcli-actors.js)
-  content/global/devtools/dbg-webconsole-actors.js (webconsole/dbg-webconsole-actors.js)
-  content/global/devtools/dbg-profiler-actors.js  (debugger/server/dbg-profiler-actors.js)
-  content/global/devtools/dbg-styleeditor-actors.js  (styleeditor/dbg-styleeditor-actors.js)
--- a/toolkit/devtools/moz.build
+++ b/toolkit/devtools/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += [
-    'debugger',
+    'server',
+    'client',
     'gcli',
     'sourcemap',
-    'webconsole',
-    'styleeditor'
+    'webconsole'
 ]
copy from toolkit/devtools/debugger/Makefile.in
copy to toolkit/devtools/server/Makefile.in
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/server/Makefile.in
@@ -24,9 +24,10 @@ EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
-	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools
+	$(INSTALL) $(IFLAGS1) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/server
+	$(INSTALL) $(IFLAGS1) $(srcdir)/actors/*.js $(FINAL_TARGET)/modules/devtools/server/actors
rename from toolkit/devtools/gcli/dbg-gcli-actors.js
rename to toolkit/devtools/server/actors/gcli.js
rename from toolkit/devtools/debugger/server/dbg-profiler-actors.js
rename to toolkit/devtools/server/actors/profiler.js
rename from toolkit/devtools/debugger/server/dbg-script-actors.js
rename to toolkit/devtools/server/actors/script.js
rename from toolkit/devtools/styleeditor/dbg-styleeditor-actors.js
rename to toolkit/devtools/server/actors/styleeditor.js
rename from toolkit/devtools/debugger/server/dbg-browser-actors.js
rename to toolkit/devtools/server/actors/webbrowser.js
rename from toolkit/devtools/webconsole/dbg-webconsole-actors.js
rename to toolkit/devtools/server/actors/webconsole.js
rename from toolkit/devtools/debugger/server/dbg-server.jsm
rename to toolkit/devtools/server/dbg-server.jsm
--- a/toolkit/devtools/debugger/server/dbg-server.jsm
+++ b/toolkit/devtools/server/dbg-server.jsm
@@ -27,19 +27,17 @@ var loadSubScript =
   "      .getService(Ci.mozIJSSubScriptLoader);\n" +
   "    loader.loadSubScript(aURL, this);\n" +
   "  } catch(e) {\n" +
   "    dump(\"Error loading: \" + aURL + \": \" + e + \" - \" + e.stack + \"\\n\");\n" +
   "    throw e;\n" +
   "  }\n" +
   "}";
 
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
-
 // Load the debugging server in a sandbox with its own compartment.
 var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"]
                       .createInstance(Ci.nsIPrincipal);
 
 var gGlobal = Cu.Sandbox(systemPrincipal);
 Cu.evalInSandbox(loadSubScript, gGlobal, "1.8");
-gGlobal.loadSubScript("chrome://global/content/devtools/dbg-server.js");
+gGlobal.loadSubScript("resource://gre/modules/devtools/server/main.js");
 
 this.DebuggerServer = gGlobal.DebuggerServer;
rename from toolkit/devtools/debugger/server/dbg-server.js
rename to toolkit/devtools/server/main.js
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/server/main.js
@@ -36,17 +36,17 @@ function dumpn(str) {
 }
 
 function dbg_assert(cond, e) {
   if (!cond) {
     return e;
   }
 }
 
-loadSubScript.call(this, "chrome://global/content/devtools/dbg-transport.js");
+loadSubScript.call(this, "resource://gre/modules/devtools/server/transport.js");
 
 // XPCOM constructors
 const ServerSocket = CC("@mozilla.org/network/server-socket;1",
                         "nsIServerSocket",
                         "initSpecialConnection");
 
 /***
  * Public API
@@ -109,17 +109,17 @@ var DebuggerServer = {
    */
   init: function DS_init(aAllowConnectionCallback) {
     if (this.initialized) {
       return;
     }
 
     this.xpcInspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
     this.initTransport(aAllowConnectionCallback);
-    this.addActors("chrome://global/content/devtools/dbg-script-actors.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/script.js");
 
     this._initialized = true;
   },
 
   /**
    * Initialize the debugger server's transport variables.  This can be
    * in place of init() for cases where the jsdebugger isn't needed.
    *
@@ -172,23 +172,23 @@ var DebuggerServer = {
   addActors: function DS_addActors(aURL) {
     loadSubScript.call(this, aURL);
   },
 
   /**
    * Install Firefox-specific actors.
    */
   addBrowserActors: function DS_addBrowserActors() {
-    this.addActors("chrome://global/content/devtools/dbg-browser-actors.js");
-    this.addActors("chrome://global/content/devtools/dbg-webconsole-actors.js");
-    this.addActors("chrome://global/content/devtools/dbg-gcli-actors.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
     if ("nsIProfiler" in Ci)
-      this.addActors("chrome://global/content/devtools/dbg-profiler-actors.js");
+      this.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
 
-    this.addActors("chrome://global/content/devtools/dbg-styleeditor-actors.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
   },
 
   /**
    * Listens on the given port for remote debugger connections.
    *
    * @param aPort int
    *        The port to listen on.
    */
copy from toolkit/devtools/debugger/moz.build
copy to toolkit/devtools/server/moz.build
rename from toolkit/devtools/debugger/nsIJSInspector.idl
rename to toolkit/devtools/server/nsIJSInspector.idl
rename from toolkit/devtools/debugger/nsJSInspector.cpp
rename to toolkit/devtools/server/nsJSInspector.cpp
rename from toolkit/devtools/debugger/nsJSInspector.h
rename to toolkit/devtools/server/nsJSInspector.h
rename from toolkit/devtools/debugger/tests/mochitest/Makefile.in
rename to toolkit/devtools/server/tests/mochitest/Makefile.in
rename from toolkit/devtools/debugger/tests/mochitest/moz.build
rename to toolkit/devtools/server/tests/mochitest/moz.build
rename from toolkit/devtools/debugger/tests/mochitest/nonchrome_unsafeDereference.html
rename to toolkit/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html
rename from toolkit/devtools/debugger/tests/mochitest/test_unsafeDereference.html
rename to toolkit/devtools/server/tests/mochitest/test_unsafeDereference.html
--- a/toolkit/devtools/debugger/tests/mochitest/test_unsafeDereference.html
+++ b/toolkit/devtools/server/tests/mochitest/test_unsafeDereference.html
@@ -23,16 +23,17 @@ addDebuggerToGlobal(this);
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   var iframe = document.createElement("iframe");
   iframe.src = "http://mochi.test:8888/chrome/toolkit/devtools/debugger/tests/mochitest/nonchrome_unsafeDereference.html";
 
   iframe.onload = function () {
     var dbg = new Debugger;
+    dbg.uncaughtExceptionHook = testExceptionHook;
     var contentDO = dbg.addDebuggee(iframe.contentWindow);
     var xhrDesc = contentDO.getOwnPropertyDescriptor('xhr');
 
     isnot(xhrDesc, undefined, "xhr should be visible as property of content global");
     isnot(xhrDesc.value, undefined, "xhr should have a value");
 
     var xhr = xhrDesc.value.unsafeDereference();
 
rename from toolkit/devtools/debugger/tests/moz.build
rename to toolkit/devtools/server/tests/moz.build
rename from toolkit/devtools/debugger/tests/unit/head_dbg.js
rename to toolkit/devtools/server/tests/unit/head_dbg.js
--- a/toolkit/devtools/debugger/tests/unit/head_dbg.js
+++ b/toolkit/devtools/server/tests/unit/head_dbg.js
@@ -13,16 +13,24 @@ Cu.import("resource://gre/modules/Servic
 // the output away anyway, unless you give it the --verbose flag.
 Services.prefs.setBoolPref("devtools.debugger.log", true);
 // Enable remote debugging for the relevant tests.
 Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
 Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
 Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 
+function testExceptionHook(ex) {
+  try {
+    do_report_unexpected_exception(ex);
+  } catch(ex) {
+    return {throw: ex}
+  }
+}
+
 // Convert an nsIScriptError 'aFlags' value into an appropriate string.
 function scriptErrorFlagsToKind(aFlags) {
   var kind;
   if (aFlags & Ci.nsIScriptError.warningFlag)
     kind = "warning";
   if (aFlags & Ci.nsIScriptError.exceptionFlag)
     kind = "exception";
   else
@@ -150,17 +158,17 @@ function initTestDebuggerServer()
 {
   DebuggerServer.addActors("resource://test/testactors.js");
   // Allow incoming connections.
   DebuggerServer.init(function () { return true; });
 }
 
 function initSourcesBackwardsCompatDebuggerServer()
 {
-  DebuggerServer.addActors("chrome://global/content/devtools/dbg-browser-actors.js");
+  DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
   DebuggerServer.addActors("resource://test/testcompatactors.js");
   DebuggerServer.init(function () { return true; });
 }
 
 function finishClient(aClient)
 {
   aClient.close(function() {
     do_test_finished();
rename from toolkit/devtools/debugger/tests/unit/post_init_global_actors.js
rename to toolkit/devtools/server/tests/unit/post_init_global_actors.js
rename from toolkit/devtools/debugger/tests/unit/post_init_tab_actors.js
rename to toolkit/devtools/server/tests/unit/post_init_tab_actors.js
rename from toolkit/devtools/debugger/tests/unit/pre_init_global_actors.js
rename to toolkit/devtools/server/tests/unit/pre_init_global_actors.js
rename from toolkit/devtools/debugger/tests/unit/pre_init_tab_actors.js
rename to toolkit/devtools/server/tests/unit/pre_init_tab_actors.js
rename from toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.coffee
rename to toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.coffee
rename from toolkit/devtools/debugger/tests/unit/source-map-data/sourcemapped.map
rename to toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.map
rename from toolkit/devtools/debugger/tests/unit/sourcemapped.js
rename to toolkit/devtools/server/tests/unit/sourcemapped.js
rename from toolkit/devtools/debugger/tests/unit/test_add_actors.js
rename to toolkit/devtools/server/tests/unit/test_add_actors.js
rename from toolkit/devtools/debugger/tests/unit/test_attach.js
rename to toolkit/devtools/server/tests/unit/test_attach.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-01.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-01.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-02.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-03.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-03.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-04.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-04.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-05.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-05.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-06.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-06.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-07.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-07.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-08.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-08.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-09.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-09.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-10.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-10.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-11.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-11.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js
rename to toolkit/devtools/server/tests/unit/test_breakpoint-12.js
rename from toolkit/devtools/debugger/tests/unit/test_breakpointstore.js
rename to toolkit/devtools/server/tests/unit/test_breakpointstore.js
--- a/toolkit/devtools/debugger/tests/unit/test_breakpointstore.js
+++ b/toolkit/devtools/server/tests/unit/test_breakpointstore.js
@@ -6,16 +6,16 @@
 // ThreadActor._breakpointStore.
 
 function run_test()
 {
   Cu.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
     .getService(Components.interfaces.mozIJSSubScriptLoader);
-  loader.loadSubScript("chrome://global/content/devtools/dbg-script-actors.js");
+  loader.loadSubScript("resource://gre/modules/devtools/server/actors/script.js");
 
   let instance1 = new ThreadActor();
   let instance2 = new ThreadActor();
   do_check_eq(instance1._breakpointStore, ThreadActor._breakpointStore);
   do_check_eq(instance2._breakpointStore, ThreadActor._breakpointStore);
   do_check_eq(instance1._breakpointStore, instance2._breakpointStore);
 }
rename from toolkit/devtools/debugger/tests/unit/test_dbgactor.js
rename to toolkit/devtools/server/tests/unit/test_dbgactor.js
rename from toolkit/devtools/debugger/tests/unit/test_dbgclient_debuggerstatement.js
rename to toolkit/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
rename from toolkit/devtools/debugger/tests/unit/test_dbgglobal.js
rename to toolkit/devtools/server/tests/unit/test_dbgglobal.js
rename from toolkit/devtools/debugger/tests/unit/test_dbgsocket.js
rename to toolkit/devtools/server/tests/unit/test_dbgsocket.js
rename from toolkit/devtools/debugger/tests/unit/test_eval-01.js
rename to toolkit/devtools/server/tests/unit/test_eval-01.js
rename from toolkit/devtools/debugger/tests/unit/test_eval-02.js
rename to toolkit/devtools/server/tests/unit/test_eval-02.js
rename from toolkit/devtools/debugger/tests/unit/test_eval-03.js
rename to toolkit/devtools/server/tests/unit/test_eval-03.js
rename from toolkit/devtools/debugger/tests/unit/test_eval-04.js
rename to toolkit/devtools/server/tests/unit/test_eval-04.js
rename from toolkit/devtools/debugger/tests/unit/test_eval-05.js
rename to toolkit/devtools/server/tests/unit/test_eval-05.js
rename from toolkit/devtools/debugger/tests/unit/test_frameactor-01.js
rename to toolkit/devtools/server/tests/unit/test_frameactor-01.js
rename from toolkit/devtools/debugger/tests/unit/test_frameactor-02.js
rename to toolkit/devtools/server/tests/unit/test_frameactor-02.js
rename from toolkit/devtools/debugger/tests/unit/test_frameactor-03.js
rename to toolkit/devtools/server/tests/unit/test_frameactor-03.js
rename from toolkit/devtools/debugger/tests/unit/test_frameactor-04.js
rename to toolkit/devtools/server/tests/unit/test_frameactor-04.js
rename from toolkit/devtools/debugger/tests/unit/test_frameactor-05.js
rename to toolkit/devtools/server/tests/unit/test_frameactor-05.js
rename from toolkit/devtools/debugger/tests/unit/test_framearguments-01.js
rename to toolkit/devtools/server/tests/unit/test_framearguments-01.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-01.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-01.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-02.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-02.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-03.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-03.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-04.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-04.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-05.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-05.js
rename from toolkit/devtools/debugger/tests/unit/test_framebindings-06.js
rename to toolkit/devtools/server/tests/unit/test_framebindings-06.js
rename from toolkit/devtools/debugger/tests/unit/test_frameclient-01.js
rename to toolkit/devtools/server/tests/unit/test_frameclient-01.js
rename from toolkit/devtools/debugger/tests/unit/test_frameclient-02.js
rename to toolkit/devtools/server/tests/unit/test_frameclient-02.js
rename from toolkit/devtools/debugger/tests/unit/test_functiongrips-01.js
rename to toolkit/devtools/server/tests/unit/test_functiongrips-01.js
rename from toolkit/devtools/debugger/tests/unit/test_getyoungestframe.js
rename to toolkit/devtools/server/tests/unit/test_getyoungestframe.js
--- a/toolkit/devtools/debugger/tests/unit/test_getyoungestframe.js
+++ b/toolkit/devtools/server/tests/unit/test_getyoungestframe.js
@@ -1,27 +1,30 @@
 function run_test()
 {
   Components.utils.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   var xpcInspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
   var g = testGlobal("test1");
 
   var dbg = new Debugger();
+  dbg.uncaughtExceptionHook = testExceptionHook;
+
   dbg.addDebuggee(g);
   dbg.onDebuggerStatement = function(aFrame) {
     do_check_true(aFrame === dbg.getNewestFrame());
     // Execute from the nested event loop, dbg.getNewestFrame() won't
     // be working anymore.
+
     do_execute_soon(function() {
       try {
         do_check_true(aFrame === dbg.getNewestFrame());
       } finally {
-        xpcInspector.exitNestedEventLoop();
+        xpcInspector.exitNestedEventLoop("test");
       }
     });
-    xpcInspector.enterNestedEventLoop();
+    xpcInspector.enterNestedEventLoop("test");
   };
 
   g.eval("function debuggerStatement() { debugger; }; debuggerStatement();");
 
   dbg.enabled = false;
 }
rename from toolkit/devtools/debugger/tests/unit/test_interrupt.js
rename to toolkit/devtools/server/tests/unit/test_interrupt.js
rename from toolkit/devtools/debugger/tests/unit/test_listsources-01.js
rename to toolkit/devtools/server/tests/unit/test_listsources-01.js
rename from toolkit/devtools/debugger/tests/unit/test_listsources-02.js
rename to toolkit/devtools/server/tests/unit/test_listsources-02.js
rename from toolkit/devtools/debugger/tests/unit/test_listsources-03.js
rename to toolkit/devtools/server/tests/unit/test_listsources-03.js
rename from toolkit/devtools/debugger/tests/unit/test_longstringactor.js
rename to toolkit/devtools/server/tests/unit/test_longstringactor.js
--- a/toolkit/devtools/debugger/tests/unit/test_longstringactor.js
+++ b/toolkit/devtools/server/tests/unit/test_longstringactor.js
@@ -3,17 +3,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function run_test()
 {
   Cu.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
     .getService(Components.interfaces.mozIJSSubScriptLoader);
-  loader.loadSubScript("chrome://global/content/devtools/dbg-script-actors.js");
+  loader.loadSubScript("resource://gre/modules/devtools/server/actors/script.js");
 
   test_LSA_disconnect();
   test_LSA_grip();
   test_LSA_onSubstring();
 }
 
 const TEST_STRING = "This is a very long string!";
 
rename from toolkit/devtools/debugger/tests/unit/test_longstringgrips-01.js
rename to toolkit/devtools/server/tests/unit/test_longstringgrips-01.js
rename from toolkit/devtools/debugger/tests/unit/test_longstringgrips-02.js
rename to toolkit/devtools/server/tests/unit/test_longstringgrips-02.js
rename from toolkit/devtools/debugger/tests/unit/test_nativewrappers.js
rename to toolkit/devtools/server/tests/unit/test_nativewrappers.js
rename from toolkit/devtools/debugger/tests/unit/test_new_source-01.js
rename to toolkit/devtools/server/tests/unit/test_new_source-01.js
rename from toolkit/devtools/debugger/tests/unit/test_nsjsinspector.js
rename to toolkit/devtools/server/tests/unit/test_nsjsinspector.js
rename from toolkit/devtools/debugger/tests/unit/test_objectgrips-01.js
rename to toolkit/devtools/server/tests/unit/test_objectgrips-01.js
rename from toolkit/devtools/debugger/tests/unit/test_objectgrips-02.js
rename to toolkit/devtools/server/tests/unit/test_objectgrips-02.js
rename from toolkit/devtools/debugger/tests/unit/test_objectgrips-03.js
rename to toolkit/devtools/server/tests/unit/test_objectgrips-03.js
rename from toolkit/devtools/debugger/tests/unit/test_objectgrips-04.js
rename to toolkit/devtools/server/tests/unit/test_objectgrips-04.js
rename from toolkit/devtools/debugger/tests/unit/test_pause_exceptions-01.js
rename to toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
rename from toolkit/devtools/debugger/tests/unit/test_pause_exceptions-02.js
rename to toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
rename from toolkit/devtools/debugger/tests/unit/test_pauselifetime-01.js
rename to toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
rename from toolkit/devtools/debugger/tests/unit/test_pauselifetime-02.js
rename to toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
rename from toolkit/devtools/debugger/tests/unit/test_pauselifetime-03.js
rename to toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
rename from toolkit/devtools/debugger/tests/unit/test_pauselifetime-04.js
rename to toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
rename from toolkit/devtools/debugger/tests/unit/test_profiler_actor.js
rename to toolkit/devtools/server/tests/unit/test_profiler_actor.js
rename from toolkit/devtools/debugger/tests/unit/test_source-01.js
rename to toolkit/devtools/server/tests/unit/test_source-01.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-01.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-01.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-02.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-02.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-03.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-03.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-04.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-04.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-05.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-05.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-06.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
rename from toolkit/devtools/debugger/tests/unit/test_sourcemaps-07.js
rename to toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
rename from toolkit/devtools/debugger/tests/unit/test_sources_backwards_compat-01.js
rename to toolkit/devtools/server/tests/unit/test_sources_backwards_compat-01.js
rename from toolkit/devtools/debugger/tests/unit/test_sources_backwards_compat-02.js
rename to toolkit/devtools/server/tests/unit/test_sources_backwards_compat-02.js
rename from toolkit/devtools/debugger/tests/unit/test_stepping-01.js
rename to toolkit/devtools/server/tests/unit/test_stepping-01.js
rename from toolkit/devtools/debugger/tests/unit/test_stepping-02.js
rename to toolkit/devtools/server/tests/unit/test_stepping-02.js
rename from toolkit/devtools/debugger/tests/unit/test_stepping-03.js
rename to toolkit/devtools/server/tests/unit/test_stepping-03.js
rename from toolkit/devtools/debugger/tests/unit/test_stepping-04.js
rename to toolkit/devtools/server/tests/unit/test_stepping-04.js
rename from toolkit/devtools/debugger/tests/unit/test_stepping-05.js
rename to toolkit/devtools/server/tests/unit/test_stepping-05.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-01.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-02.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-03.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-04.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-05.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
rename from toolkit/devtools/debugger/tests/unit/test_threadlifetime-06.js
rename to toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
rename from toolkit/devtools/debugger/tests/unit/test_unsafeDereference.js
rename to toolkit/devtools/server/tests/unit/test_unsafeDereference.js
rename from toolkit/devtools/debugger/tests/unit/testactors.js
rename to toolkit/devtools/server/tests/unit/testactors.js
rename from toolkit/devtools/debugger/tests/unit/testcompatactors.js
rename to toolkit/devtools/server/tests/unit/testcompatactors.js
rename from toolkit/devtools/debugger/tests/unit/xpcshell.ini
rename to toolkit/devtools/server/tests/unit/xpcshell.ini
rename from toolkit/devtools/debugger/dbg-transport.js
rename to toolkit/devtools/server/transport.js
deleted file mode 100644
--- a/toolkit/devtools/styleeditor/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-#libs::
-#  $(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
deleted file mode 100644
--- a/toolkit/devtools/styleeditor/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-