Move framework/inspector/server to services/inspector

Moving the inspector WebSocket proxy server out of the framework directory
simplifies the mappings for the HTTP servers.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/687673004

BUILD.gn

@@ -13,7 +13,7 @@ group("sky") {
     "//sky/engine/platform:platform_unittests",
     "//sky/engine/web:sky_unittests",
     "//sky/engine/wtf:unittests",
-    "//sky/framework/inspector",
+    "//sky/services/inspector",
     "//sky/viewer",
   ]
   if (use_aura) {

framework/inspector/BUILD.gn

-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-group("inspector") {
-  testonly = true
-
-  deps = [
-    "//sky/framework/inspector/server",
-    ":inspector_files",
-  ]
-}
-
-copy("inspector_files") {
-  sources = [
-    "console-agent.sky",
-    "dom-agent.sky",
-    "inspector.sky",
-    "page-agent.sky",
-    "worker-agent.sky",
-  ]
-
-  outputs = [ "$target_gen_dir/{{source_file_part}}" ]
-}

framework/inspector/inspector.sky

 <link rel="import" href="/mojo/public/html/connection.html" as="connection" />
 <link rel="import" href="/mojo/public/html/core.html" as="core" />
 <link rel="import" href="/mojo/public/html/support.html" as="support" />
-<link rel="import" href="/sky/framework/inspector/server/inspector.mojom.html" as="inspector" />
+<link rel="import" href="/sky/services/inspector/inspector.mojom.html" as="inspector" />
 <link rel="import" href="console-agent.sky" as="ConsoleAgent" />
 <link rel="import" href="dom-agent.sky" as="DOMAgent" />
 <link rel="import" href="page-agent.sky" as="PageAgent" />

framework/inspector/server/BUILD.gn → services/inspector/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-group("server") {
+group("inspector") {
   testonly = true
 
   deps = [

framework/inspector/server/inspector_frontend_impl.cc → services/inspector/inspector_frontend_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/framework/inspector/server/inspector_frontend_impl.h"
+#include "sky/services/inspector/inspector_frontend_impl.h"
 
 #include "base/lazy_instance.h"
 #include "net/server/http_server.h"

framework/inspector/server/inspector_frontend_impl.h → services/inspector/inspector_frontend_impl.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_
-#define SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_
+#ifndef SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_
+#define SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_
 
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "net/server/http_server.h"
 #include "net/socket/tcp_server_socket.h"
-#include "sky/framework/inspector/server/inspector.mojom.h"
+#include "sky/services/inspector/inspector.mojom.h"
 
 namespace sky {
 namespace inspector {
@@ -53,4 +53,4 @@ typedef mojo::InterfaceFactoryImpl<
 }  // namespace tester
 }  // namespace sky
 
-#endif  // SKY_FRAMEWORK_INSPECTOR_SERVER_INSPECTOR_FRONTEND_IMPL_H_
+#endif  // SKY_SERVICES_INSPECTOR_INSPECTOR_FRONTEND_IMPL_H_

framework/inspector/server/server.cc → services/inspector/server.cc

@@ -6,7 +6,7 @@
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "sky/framework/inspector/server/inspector_frontend_impl.h"
+#include "sky/services/inspector/inspector_frontend_impl.h"
 
 namespace sky {
 namespace inspector {

tools/sky_server

@@ -42,17 +42,11 @@ def main():
             'tools.staticdir.on': True,
             'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky'),
         },
-        # src-relative to avoid needing to rebuild when changing inspector:
         '/sky/framework': {
             'tools.staticdir.on': True,
             'tools.staticdir.dir':
                 os.path.join(SKY_ROOT, 'framework'),
         },
-        '/sky/framework/inspector/server': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky', 'framework',
-                'inspector', 'server'),
-        },
      }
     cherrypy.quickstart(config=config)
 

tools/webkitpy/layout_tests/servers/apache_http.py

@@ -60,6 +60,8 @@ class ApacheHTTP(server_base.ServerBase):
             self._filesystem.abspath(port_obj.gen_dir()), "mojo")
         sky_gen_dir = self._filesystem.join(
             self._filesystem.abspath(port_obj.gen_dir()), "sky")
+        sky_framework_dir = self._filesystem.join(
+            self._filesystem.abspath(port_obj.path_from_chromium_base("sky", "framework")))
         js_test_resources_dir = self._filesystem.join(test_dir, "resources")
         media_resources_dir = self._filesystem.join(test_dir, "media")
         mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
@@ -75,6 +77,7 @@ class ApacheHTTP(server_base.ServerBase):
             '-C', 'ServerRoot "%s"' % server_root,
             '-C', 'DocumentRoot "%s"' % test_dir,
             '-c', 'Alias /mojo "%s"' % mojo_gen_dir,
+            '-c', 'Alias /sky/framework "%s"' % sky_framework_dir,
             '-c', 'Alias /sky "%s"' % sky_gen_dir,
             '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,
             '-c', 'Alias /media-resources "%s"' % media_resources_dir,