Bug 1446222 - Move websocket-server.js to socket dir. r=jdescottes

MozReview-Commit-ID: 9LZZXTKGCOb

--HG--
rename : devtools/server/tests/mochitest/test_websocket-server.html => devtools/server/socket/tests/test_websocket-server.html
rename : devtools/server/websocket-server.js => devtools/server/socket/websocket-server.js
extra : rebase_source : bc009ad0078394d2e24599fcd999ad6123ee094a

devtools/server/moz.build

@@ -9,6 +9,7 @@ include('../templates.mozbuild')
 DIRS += [
     'actors',
     'performance',
+    'socket',
 ]
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
@@ -21,7 +22,6 @@ DevToolsModules(
     'content-server.jsm',
     'main.js',
     'service-worker-child.js',
-    'websocket-server.js',
     'worker.js'
 )
 

devtools/server/socket/moz.build

@@ -0,0 +1,11 @@
+# -*- Mode: python; 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/.
+
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+
+DevToolsModules(
+    'websocket-server.js',
+)

devtools/server/socket/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  // Extend from the common devtools mochitest eslintrc config.
+  "extends": "../../../.eslintrc.xpcshell.js"
+};

devtools/server/socket/tests/chrome.ini

@@ -0,0 +1,3 @@
+[DEFAULT]
+tags = devtools
+[test_websocket-server.html]

devtools/server/socket/tests/test_websocket-server.html

@@ -14,7 +14,7 @@
 window.onload = function() {
   const CC = Components.Constructor;
   const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-  const WebSocketServer = require("devtools/server/websocket-server");
+  const WebSocketServer = require("devtools/server/socket/websocket-server");
 
   const ServerSocket = CC("@mozilla.org/network/server-socket;1",
     "nsIServerSocket", "init");

devtools/server/tests/mochitest/chrome.ini

@@ -108,4 +108,3 @@ support-files =
 skip-if = !e10s # test is designed to work on e10s only
 [test_webextension-addon-debugging-reload.html]
 skip-if = !e10s # test is designed to work on e10s only
-[test_websocket-server.html]

devtools/shared/security/socket.js

@@ -17,7 +17,7 @@ var defer = require("devtools/shared/defer");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { dumpn, dumpv } = DevToolsUtils;
 loader.lazyRequireGetter(this, "WebSocketServer",
-  "devtools/server/websocket-server");
+  "devtools/server/socket/websocket-server");
 loader.lazyRequireGetter(this, "DebuggerTransport",
   "devtools/shared/transport/transport", true);
 loader.lazyRequireGetter(this, "WebSocketDebuggerTransport",