Move services code brought in from Mojo to live under //third_party.

This CL moves services code that is brought in from the Mojo repo and currently living in //mojo/services to instead live in //third_party/mojo_services/src. It fixes up include paths, buildfile references, and DEPS entries to account for the new state of the world. Review URL: https://codereview.chromium.org/861683003 Cr-Commit-Position: refs/heads/master@{#313876}
Denger-Network · Jan 30, 2015 · 33cb045 · 33cb045
1 parent 673df3d
commit 33cb045
Show file tree

Hide file tree

Showing 115 changed files with 137 additions and 60 deletions.
diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
@@ -14,6 +14,6 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//mojo/services/geometry/public/interfaces",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
   ]
 }
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/services/geometry/public/interfaces/geometry.mojom";
+import "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom";
 
 // See media/base/buffering_state.h for descriptions.
 // Kept in sync with media::BufferingState via static_asserts.

diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
@@ -32,9 +32,9 @@ source_set("converters") {
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/services/geometry/public/interfaces",
     "//skia",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
   ]
 }
 

diff --git a/mojo/OWNERS b/mojo/OWNERS
@@ -1,6 +1,2 @@
-# This subdirectory is being canonically developed in the mojo repository,
-# please land changes there or they will be blown away by the next sync.
-# See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nAwEbgCrUio/73AA2fnfcpEJ
-# for more details.
 ben@chromium.org
 jamesr@chromium.org
diff --git a/mojo/cc/BUILD.gn b/mojo/cc/BUILD.gn
@@ -12,11 +12,11 @@ source_set("cc") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//mojo/converters/surfaces",
-    "//mojo/services/surfaces/public/interfaces",
     "//skia",
     "//third_party/mojo/src/mojo/public/c/gles2",
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system",
+    "//third_party/mojo_services/src/surfaces/public/interfaces",
   ]
 
   sources = [

diff --git a/mojo/cc/DEPS b/mojo/cc/DEPS
@@ -2,4 +2,5 @@ include_rules = [
   "+cc",
   "-cc/blink",
   "+gpu/command_buffer/client",
+  "+third_party/mojo_services/src/surfaces",
 ]
diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "cc/output/output_surface.h"
 #include "cc/surfaces/surface_id.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace mojo {
 

diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn
@@ -13,8 +13,8 @@ component("geometry") {
     "//skia",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/services/geometry/public/interfaces",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
   ]
 
   defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]

diff --git a/mojo/converters/geometry/DEPS b/mojo/converters/geometry/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+third_party/mojo_services/src/geometry",
   "+ui/gfx/geometry",
   "+ui/gfx/transform.h",
 ]
diff --git a/mojo/converters/geometry/geometry_type_converters.h b/mojo/converters/geometry/geometry_type_converters.h
@@ -6,7 +6,7 @@
 #define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
 
 #include "mojo/converters/geometry/mojo_geometry_export.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"

diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn
@@ -19,8 +19,8 @@ component("input_events") {
     "//ui/gfx/geometry",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/services/input_events/public/interfaces",
-    "//mojo/services/geometry/public/interfaces",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo_services/src/input_events/public/interfaces",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
   ]
 }
diff --git a/mojo/converters/input_events/DEPS b/mojo/converters/input_events/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
+  "+third_party/mojo_services/src/input_events",
   "+ui/events",
 ]
diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc
@@ -11,7 +11,7 @@
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 

diff --git a/mojo/converters/input_events/input_events_type_converters.h b/mojo/converters/input_events/input_events_type_converters.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/converters/input_events/mojo_input_events_export.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "ui/events/event.h"
 
 namespace mojo {

diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn
@@ -28,9 +28,9 @@ component("surfaces") {
     "//gpu",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/services/surfaces/public/interfaces:surface_id",
-    "//mojo/services/surfaces/public/interfaces",
     "//skia",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo_services/src/surfaces/public/interfaces:surface_id",
+    "//third_party/mojo_services/src/surfaces/public/interfaces",
   ]
 }
diff --git a/mojo/converters/surfaces/DEPS b/mojo/converters/surfaces/DEPS
@@ -5,6 +5,7 @@ include_rules = [
   "+cc/surfaces",
   "+gpu/command_buffer/common/mailbox.h",
   "+gpu/command_buffer/common/mailbox_holder.h",
+  "+third_party/mojo_services/src/surfaces",
   "+third_party/skia/include",
   "+ui/gfx/geometry",
   "+ui/gfx/transform.h",

diff --git a/mojo/converters/surfaces/surfaces_type_converters.h b/mojo/converters/surfaces/surfaces_type_converters.h
@@ -12,9 +12,9 @@
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "mojo/converters/surfaces/mojo_surfaces_export.h"
-#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/surface_id.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {

diff --git a/mojo/converters/surfaces/surfaces_utils.h b/mojo/converters/surfaces/surfaces_utils.h
@@ -6,7 +6,7 @@
 #define MOJO_CONVERTERS_SURFACES_SURFACES_UTILS_H_
 
 #include "mojo/converters/surfaces/mojo_surfaces_export.h"
-#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
 
 namespace gfx {
 class Rect;

diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
@@ -15,11 +15,11 @@ test("mojo_surfaces_lib_unittests") {
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
     "//mojo/environment:chromium",
-    "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/surfaces/public/interfaces",
     "//skia",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
+    "//third_party/mojo_services/src/surfaces/public/interfaces",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx:test_support",

diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
@@ -6,15 +6,15 @@ import("//build/config/ui.gni")
 
 group("services") {
   deps = [
-    "//mojo/services/clipboard/public/interfaces",
-    "//mojo/services/content_handler/public/interfaces",
-    "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/input_events/public/interfaces",
-    "//mojo/services/native_viewport/public/interfaces",
-    "//mojo/services/navigation/public/interfaces",
     "//mojo/services/network/public/interfaces",
-    "//mojo/services/surfaces/public/interfaces",
-    "//mojo/services/view_manager/public/interfaces",
+    "//third_party/mojo_services/src/clipboard/public/interfaces",
+    "//third_party/mojo_services/src/content_handler/public/interfaces",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
+    "//third_party/mojo_services/src/input_events/public/interfaces",
+    "//third_party/mojo_services/src/native_viewport/public/interfaces",
+    "//third_party/mojo_services/src/navigation/public/interfaces",
+    "//third_party/mojo_services/src/surfaces/public/interfaces",
+    "//third_party/mojo_services/src/view_manager/public/interfaces",
   ]
 
   if (!is_component_build) {

diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
@@ -83,27 +83,27 @@ source_set("lib") {
     "//mojo/common",
     "//mojo/converters/surfaces",
     "//mojo/services/network/public/cpp",
-    "//mojo/services/accessibility/public/interfaces",
-    "//mojo/services/clipboard/public/interfaces",
-    "//mojo/services/content_handler/public/interfaces",
-    "//mojo/services/gpu/public/interfaces",
-    "//mojo/services/input_events/public/interfaces",
-    "//mojo/services/navigation/public/interfaces",
     "//mojo/services/network/public/interfaces",
-    "//mojo/services/surfaces/public/interfaces",
     "//net",
     "//skia",
     "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
     "//third_party/mojo/src/mojo/public/cpp/utility",
     "//third_party/mojo/src/mojo/public/interfaces/application",
+    "//third_party/mojo_services/src/accessibility/public/interfaces",
+    "//third_party/mojo_services/src/clipboard/public/interfaces",
+    "//third_party/mojo_services/src/content_handler/public/interfaces",
+    "//third_party/mojo_services/src/gpu/public/interfaces",
+    "//third_party/mojo_services/src/input_events/public/interfaces",
+    "//third_party/mojo_services/src/navigation/public/interfaces",
+    "//third_party/mojo_services/src/surfaces/public/interfaces",
     "//ui/native_theme",
     "//url",
   ]
 
   public_deps = [
-    "//mojo/services/view_manager/public/cpp",
     "//third_party/WebKit/public:blink",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo_services/src/view_manager/public/cpp",
     ":generate_blink_resource_map",
   ]
 }

diff --git a/mojo/services/html_viewer/DEPS b/mojo/services/html_viewer/DEPS
@@ -6,9 +6,10 @@ include_rules = [
   "+mojo/cc",
   "+mojo/converters/surfaces",
   "+mojo/application",
-  "+mojo/services",
+  "+mojo/services/network",
   "+net/base",
   "+skia",
+  "+third_party/mojo_services/src",
   "+third_party/WebKit/public",
   "+third_party/skia/include",
   "+ui/base",

diff --git a/mojo/services/html_viewer/ax_provider_impl.h b/mojo/services/html_viewer/ax_provider_impl.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_
 #define MOJO_SERVICES_HTML_VIEWER_AX_PROVIDER_IMPL_H_
 
-#include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
+#include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
 
 namespace blink {
 class WebAXObject;

diff --git a/mojo/services/html_viewer/blink_basic_type_converters.h b/mojo/services/html_viewer/blink_basic_type_converters.h
@@ -7,9 +7,9 @@
 
 #include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
 
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
+#include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
 
 namespace blink {
 struct WebRect;

diff --git a/mojo/services/html_viewer/blink_input_events_type_converters.cc b/mojo/services/html_viewer/blink_input_events_type_converters.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom.h"
 
 namespace mojo {
 namespace {

diff --git a/mojo/services/html_viewer/blink_input_events_type_converters.h b/mojo/services/html_viewer/blink_input_events_type_converters.h
@@ -6,7 +6,7 @@
 #define MOJO_SERVICES_HTML_VIEWER_BLINK_INPUT_EVENTS_TYPE_CONVERTERS_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 
 namespace blink {
 class WebInputEvent;

diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc
@@ -20,8 +20,6 @@
 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
 #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
 #include "mojo/services/html_viewer/weburlloader_impl.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
@@ -37,6 +35,8 @@
 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom.h"
+#include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"

diff --git a/mojo/services/html_viewer/html_document.h b/mojo/services/html_viewer/html_document.h
@@ -9,13 +9,8 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/html_viewer/ax_provider_impl.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
-#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
-#include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
@@ -24,6 +19,11 @@
 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
 #include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h"
+#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
+#include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
+#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
+#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
+#include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h"
 
 namespace base {
 class MessageLoopProxy;

diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
@@ -10,7 +10,6 @@
 #include "base/threading/thread.h"
 #include "gin/public/isolate_holder.h"
 #include "mojo/application/application_runner_chromium.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/html_viewer/html_document.h"
 #include "mojo/services/html_viewer/mojo_blink_platform_impl.h"
 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
@@ -24,6 +23,7 @@
 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
+#include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h"
 
 #if !defined(COMPONENT_BUILD)
 #include "base/i18n/icu_util.h"

diff --git a/mojo/services/html_viewer/webclipboard_impl.h b/mojo/services/html_viewer/webclipboard_impl.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_
 #define MOJO_SERVICES_HTML_VIEWER_WEBCLIPBOARD_IMPL_H_
 
-#include "mojo/services/clipboard/public/interfaces/clipboard.mojom.h"
 #include "third_party/WebKit/public/platform/WebClipboard.h"
+#include "third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom.h"
 
 namespace html_viewer {
 

diff --git a/mojo/services/html_viewer/weblayertreeview_impl.cc b/mojo/services/html_viewer/weblayertreeview_impl.cc
@@ -13,8 +13,8 @@
 #include "mojo/cc/context_provider_mojo.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/services/view_manager/public/cpp/view.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
+#include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 
 namespace html_viewer {
 

diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h
@@ -12,9 +12,9 @@
 #include "base/single_thread_task_runner.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "mojo/cc/output_surface_mojo.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
+#include "third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom.h"
+#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom.h"
 
 namespace base {
 class MessageLoopProxy;