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}

115 files changed, 137 insertions, 60 deletions

diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
index b483688..4a0ca19 100644
--- 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
index 43db2b5..fc14286 100644
--- 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
index ca6e36e..77b15bb 100644
--- 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
index cd7230f..831681d 100644
--- 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
index 43b9041..3cb6ee4 100644
--- 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
index 9390f5e..0e75526 100644
--- 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
index 445d1ab..a34193e 100644
--- 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
index b8c1d00..db0aea9 100644
--- 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
index 3e03810..fec3393 100644
--- 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
index ff55fc4..59d3552 100644
--- 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
index 751d039..2c05f8d 100644
--- 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
index fe1d98e..6fdb198 100644
--- 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
index cd78386..f6be2f1 100644
--- 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
index 96cb264..d520006 100644
--- 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
index 132a858..3428e64 100644
--- 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
index bce2d34..ceda7b9 100644
--- 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
index 3d01b79..f41af6d 100644
--- 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
index a4f57f3..ef5b91e 100644
--- 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
index efbd72f..e4e5a89 100644
--- 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
index d719f1a..eea5522 100644
--- 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
index 1d2c63d..77d9656 100644
--- 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
index 37deb33..8f4c26a 100644
--- 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
index fba6be4..ec6c8de 100644
--- 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
index 65f0681..eb762a8 100644
--- 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
index 0f6f6c1..11434b5 100644
--- 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
index 9e3e9ae..442239c 100644
--- 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
index de6e178..701860a 100644
--- 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
index ea3019b..eedfc06 100644
--- 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
index 73f3045..02c290a 100644
--- 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
index b4320d8..5edccf4 100644
--- 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
index 77c74ec..0c2811a 100644
--- 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
index c4e420a..42ae1bc 100644
--- 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;
diff --git a/mojo/services/public/build/config/BUILD.gn b/mojo/services/public/build/config/BUILD.gn
index 21629ab2..c6b13b6 100644
--- a/mojo/services/public/build/config/BUILD.gn
+++ b/mojo/services/public/build/config/BUILD.gn
@@ -1,14 +1,19 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2015 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.
 
-# The absolute path to the directory containing the Mojo services.
+# The absolute path to the directory containing the Mojo services produced
+# out of Chromium.
 mojo_services_root = get_path_info("../../..", "abspath")
 
+# NOTE: This config name must be in sync with the name of the config used by
+# services that developed out of the Mojo repo so that Chromium's services'
+# BUILD.gn files can work seamlessly in Chromium and when pulled into Mojo or a
+# client repo.
 config("mojo_services") {
   include_dirs = [
-    # Include paths in Mojo services' client-side code are specified relative
-    # to the directory holding the services' client-side code.
+    # Include paths in Chromium Mojo services' client-side code are specified
+    # relative to the directory holding the services' client-side code.
     mojo_services_root,
 
     # The same goes for files generated from mojoms.
diff --git a/third_party/mojo_services/LICENSE b/third_party/mojo_services/LICENSE
new file mode 100644
index 0000000..972bb2e
--- /dev/null
+++ b/third_party/mojo_services/LICENSE
@@ -0,0 +1,27 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/mojo_services/OWNERS b/third_party/mojo_services/OWNERS
new file mode 100644
index 0000000..3b3e7c0
--- /dev/null
+++ b/third_party/mojo_services/OWNERS
@@ -0,0 +1,6 @@
+# The code in src/ 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/third_party/mojo_services/README.chromium b/third_party/mojo_services/README.chromium
new file mode 100644
index 0000000..265122a
--- /dev/null
+++ b/third_party/mojo_services/README.chromium
@@ -0,0 +1,14 @@
+Name: MojoServices
+Short Name: mojo-services
+URL: https://github.com/domokit/mojo
+Version: Unknown
+Security Critical: Yes
+License: Chromium
+License Android Compatible: yes
+
+Description:
+This codebase contains the client-facing interfaces of services developed in
+the Mojo repository.
+
+Local Modifications:
+None.
diff --git a/mojo/services/accessibility/public/interfaces/BUILD.gn b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
index 7997908c..7997908c 100644
--- a/mojo/services/accessibility/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
diff --git a/mojo/services/accessibility/public/interfaces/accessibility.mojom b/third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom
index 3958388..3958388 100644
--- a/mojo/services/accessibility/public/interfaces/accessibility.mojom
+++ b/third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom
diff --git a/mojo/services/clipboard/public/interfaces/BUILD.gn b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
index 7ac21d2..7ac21d2 100644
--- a/mojo/services/clipboard/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
diff --git a/mojo/services/clipboard/public/interfaces/clipboard.mojom b/third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom
index ca4d6b1..ca4d6b1 100644
--- a/mojo/services/clipboard/public/interfaces/clipboard.mojom
+++ b/third_party/mojo_services/src/clipboard/public/interfaces/clipboard.mojom
diff --git a/mojo/services/content_handler/public/interfaces/BUILD.gn b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
index 5016c65..5016c65 100644
--- a/mojo/services/content_handler/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
diff --git a/mojo/services/content_handler/public/interfaces/content_handler.mojom b/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom
index 39ddfea..39ddfea 100644
--- a/mojo/services/content_handler/public/interfaces/content_handler.mojom
+++ b/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom
diff --git a/mojo/services/geometry/public/cpp/BUILD.gn b/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn
index c05b8d3..c05b8d3 100644
--- a/mojo/services/geometry/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn
diff --git a/mojo/services/geometry/public/cpp/DEPS b/third_party/mojo_services/src/geometry/public/cpp/DEPS
index b413470..b413470 100644
--- a/mojo/services/geometry/public/cpp/DEPS
+++ b/third_party/mojo_services/src/geometry/public/cpp/DEPS
diff --git a/mojo/services/geometry/public/cpp/geometry_util.h b/third_party/mojo_services/src/geometry/public/cpp/geometry_util.h
index f69fac3..f69fac3 100644
--- a/mojo/services/geometry/public/cpp/geometry_util.h
+++ b/third_party/mojo_services/src/geometry/public/cpp/geometry_util.h
diff --git a/mojo/services/geometry/public/interfaces/BUILD.gn b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
index 4896add..4896add 100644
--- a/mojo/services/geometry/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
diff --git a/mojo/services/geometry/public/interfaces/geometry.mojom b/third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom
index 62bc6c8..62bc6c8 100644
--- a/mojo/services/geometry/public/interfaces/geometry.mojom
+++ b/third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom
diff --git a/mojo/services/gpu/public/interfaces/BUILD.gn b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
index 52723ac..52723ac 100644
--- a/mojo/services/gpu/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
diff --git a/mojo/services/gpu/public/interfaces/command_buffer.mojom b/third_party/mojo_services/src/gpu/public/interfaces/command_buffer.mojom
index a31b3dd..a31b3dd 100644
--- a/mojo/services/gpu/public/interfaces/command_buffer.mojom
+++ b/third_party/mojo_services/src/gpu/public/interfaces/command_buffer.mojom
diff --git a/mojo/services/gpu/public/interfaces/gpu.mojom b/third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom
index c61869c..c61869c 100644
--- a/mojo/services/gpu/public/interfaces/gpu.mojom
+++ b/third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom
diff --git a/mojo/services/gpu/public/interfaces/gpu_capabilities.mojom b/third_party/mojo_services/src/gpu/public/interfaces/gpu_capabilities.mojom
index 2450139..2450139 100644
--- a/mojo/services/gpu/public/interfaces/gpu_capabilities.mojom
+++ b/third_party/mojo_services/src/gpu/public/interfaces/gpu_capabilities.mojom
diff --git a/mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom b/third_party/mojo_services/src/gpu/public/interfaces/viewport_parameter_listener.mojom
index 5afa931..5afa931 100644
--- a/mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom
+++ b/third_party/mojo_services/src/gpu/public/interfaces/viewport_parameter_listener.mojom
diff --git a/mojo/services/input_events/public/interfaces/BUILD.gn b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
index e7a75f2..e7a75f2 100644
--- a/mojo/services/input_events/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
diff --git a/mojo/services/input_events/public/interfaces/input_event_constants.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom
index f137fb3..f137fb3 100644
--- a/mojo/services/input_events/public/interfaces/input_event_constants.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom
diff --git a/mojo/services/input_events/public/interfaces/input_events.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
index 1cab579..1cab579 100644
--- a/mojo/services/input_events/public/interfaces/input_events.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
diff --git a/mojo/services/input_events/public/interfaces/input_key_codes.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_key_codes.mojom
index 695f5bd..695f5bd 100644
--- a/mojo/services/input_events/public/interfaces/input_key_codes.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_key_codes.mojom
diff --git a/third_party/mojo_services/src/mojo_sdk_root.gni b/third_party/mojo_services/src/mojo_sdk_root.gni
new file mode 100644
index 0000000..be420b7
--- /dev/null
+++ b/third_party/mojo_services/src/mojo_sdk_root.gni
@@ -0,0 +1,7 @@
+# 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.
+
+# This variable should point to the parent directory of the Mojo SDK.
+mojo_sdk_root = "//third_party/mojo/src"
+network_service_root = "//mojo/services"
diff --git a/mojo/services/native_viewport/public/cpp/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn
index 035ddfa..035ddfa 100644
--- a/mojo/services/native_viewport/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn
diff --git a/mojo/services/native_viewport/public/cpp/DEPS b/third_party/mojo_services/src/native_viewport/public/cpp/DEPS
index 8fc8a7f..8fc8a7f 100644
--- a/mojo/services/native_viewport/public/cpp/DEPS
+++ b/third_party/mojo_services/src/native_viewport/public/cpp/DEPS
diff --git a/mojo/services/native_viewport/public/cpp/args.h b/third_party/mojo_services/src/native_viewport/public/cpp/args.h
index 2bad98d..2bad98d 100644
--- a/mojo/services/native_viewport/public/cpp/args.h
+++ b/third_party/mojo_services/src/native_viewport/public/cpp/args.h
diff --git a/mojo/services/native_viewport/public/cpp/lib/args.cc b/third_party/mojo_services/src/native_viewport/public/cpp/lib/args.cc
index 25ee1ae..25ee1ae 100644
--- a/mojo/services/native_viewport/public/cpp/lib/args.cc
+++ b/third_party/mojo_services/src/native_viewport/public/cpp/lib/args.cc
diff --git a/mojo/services/native_viewport/public/interfaces/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
index 0311564..0311564 100644
--- a/mojo/services/native_viewport/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
diff --git a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom b/third_party/mojo_services/src/native_viewport/public/interfaces/native_viewport.mojom
index 75757c2..75757c2 100644
--- a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
+++ b/third_party/mojo_services/src/native_viewport/public/interfaces/native_viewport.mojom
diff --git a/mojo/services/navigation/public/interfaces/BUILD.gn b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
index da9fc70..da9fc70 100644
--- a/mojo/services/navigation/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
diff --git a/mojo/services/navigation/public/interfaces/navigation.mojom b/third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom
index 0d2656a..0d2656a 100644
--- a/mojo/services/navigation/public/interfaces/navigation.mojom
+++ b/third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom
diff --git a/third_party/mojo_services/src/public/build/config/BUILD.gn b/third_party/mojo_services/src/public/build/config/BUILD.gn
new file mode 100644
index 0000000..21629ab2
--- /dev/null
+++ b/third_party/mojo_services/src/public/build/config/BUILD.gn
@@ -0,0 +1,17 @@
+# 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.
+
+# The absolute path to the directory containing the Mojo services.
+mojo_services_root = get_path_info("../../..", "abspath")
+
+config("mojo_services") {
+  include_dirs = [
+    # Include paths in Mojo services' client-side code are specified relative
+    # to the directory holding the services' client-side code.
+    mojo_services_root,
+
+    # The same goes for files generated from mojoms.
+    root_gen_dir + mojo_services_root,
+  ]
+}
diff --git a/mojo/services/public/js/application.js b/third_party/mojo_services/src/public/js/application.js
index d4aa1e6..d4aa1e6 100644
--- a/mojo/services/public/js/application.js
+++ b/third_party/mojo_services/src/public/js/application.js
diff --git a/mojo/services/public/js/service_provider.js b/third_party/mojo_services/src/public/js/service_provider.js
index a6a81ca..a6a81ca 100644
--- a/mojo/services/public/js/service_provider.js
+++ b/third_party/mojo_services/src/public/js/service_provider.js
diff --git a/mojo/services/public/js/shell.js b/third_party/mojo_services/src/public/js/shell.js
index e6c2dee..e6c2dee 100644
--- a/mojo/services/public/js/shell.js
+++ b/third_party/mojo_services/src/public/js/shell.js
diff --git a/mojo/services/public/sky/BUILD.gn b/third_party/mojo_services/src/public/sky/BUILD.gn
index 4776aa3..4776aa3 100644
--- a/mojo/services/public/sky/BUILD.gn
+++ b/third_party/mojo_services/src/public/sky/BUILD.gn
diff --git a/mojo/services/surfaces/public/cpp/BUILD.gn b/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn
index ddac4f3..ddac4f3 100644
--- a/mojo/services/surfaces/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn
diff --git a/mojo/services/surfaces/public/cpp/DEPS b/third_party/mojo_services/src/surfaces/public/cpp/DEPS
index bc9750c..bc9750c 100644
--- a/mojo/services/surfaces/public/cpp/DEPS
+++ b/third_party/mojo_services/src/surfaces/public/cpp/DEPS
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.cc b/third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.cc
index 2e52fd2..2e52fd2 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.cc
+++ b/third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.cc
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.h b/third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.h
index f74731e..f74731e 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.h
+++ b/third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.h
diff --git a/mojo/services/surfaces/public/interfaces/BUILD.gn b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
index 76f5172..76f5172 100644
--- a/mojo/services/surfaces/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
diff --git a/mojo/services/surfaces/public/interfaces/quads.mojom b/third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom
index 58f85e0..58f85e0 100644
--- a/mojo/services/surfaces/public/interfaces/quads.mojom
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom
diff --git a/mojo/services/surfaces/public/interfaces/surface_id.mojom b/third_party/mojo_services/src/surfaces/public/interfaces/surface_id.mojom
index 197e6f8b..197e6f8b 100644
--- a/mojo/services/surfaces/public/interfaces/surface_id.mojom
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/surface_id.mojom
diff --git a/mojo/services/surfaces/public/interfaces/surfaces.mojom b/third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom
index 7badcd3..7badcd3 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces.mojom
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom
diff --git a/mojo/services/surfaces/public/interfaces/surfaces_service.mojom b/third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom
index e1ca690..e1ca690 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces_service.mojom
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/surfaces_service.mojom
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn
index b1a0bdb..b1a0bdb 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn
diff --git a/mojo/services/view_manager/public/cpp/DEPS b/third_party/mojo_services/src/view_manager/public/cpp/DEPS
index c08c2c8..c08c2c8 100644
--- a/mojo/services/view_manager/public/cpp/DEPS
+++ b/third_party/mojo_services/src/view_manager/public/cpp/DEPS
diff --git a/mojo/services/view_manager/public/cpp/lib/DEPS b/third_party/mojo_services/src/view_manager/public/cpp/lib/DEPS
index f36ebc7..f36ebc7 100644
--- a/mojo/services/view_manager/public/cpp/lib/DEPS
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/DEPS
diff --git a/mojo/services/view_manager/public/cpp/lib/view.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view.cc
index f7e7784..f7e7784 100644
--- a/mojo/services/view_manager/public/cpp/lib/view.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_factory.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
index be4463c..be4463c 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_factory.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
index 595e039..595e039 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
index 2405229..2405229 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h
diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_context.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_context.cc
index a47f59a..a47f59a 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_manager_context.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_context.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_observer.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_observer.cc
index 456147c..456147c 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_observer.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_observer.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_private.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_private.cc
index 20232e8..20232e8 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_private.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_private.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view_private.h b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_private.h
index 1c54567..1c54567 100644
--- a/mojo/services/view_manager/public/cpp/lib/view_private.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_private.h
diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn
index e912084..e912084 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn
diff --git a/mojo/services/view_manager/public/cpp/tests/DEPS b/third_party/mojo_services/src/view_manager/public/cpp/tests/DEPS
index 0f9ddb4..0f9ddb4 100644
--- a/mojo/services/view_manager/public/cpp/tests/DEPS
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/DEPS
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.cc b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_test_suite.cc
index 2bfdd1e..2bfdd1e 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_test_suite.cc
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_test_suite.h
index ef81661..ef81661 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_test_suite.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_test_suite.h
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_unittest.cc
index bc69464..bc69464 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittests.cc b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_unittests.cc
index 95a7b5c..95a7b5c 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittests.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_manager_unittests.cc
diff --git a/mojo/services/view_manager/public/cpp/tests/view_unittest.cc b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
index 149eb3a..149eb3a 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_unittest.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/view_unittest.cc
diff --git a/mojo/services/view_manager/public/cpp/types.h b/third_party/mojo_services/src/view_manager/public/cpp/types.h
index 5652691..5652691 100644
--- a/mojo/services/view_manager/public/cpp/types.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/types.h
diff --git a/mojo/services/view_manager/public/cpp/util.h b/third_party/mojo_services/src/view_manager/public/cpp/util.h
index 33e75dd..33e75dd 100644
--- a/mojo/services/view_manager/public/cpp/util.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/util.h
diff --git a/mojo/services/view_manager/public/cpp/view.h b/third_party/mojo_services/src/view_manager/public/cpp/view.h
index 07bc5b0..07bc5b0 100644
--- a/mojo/services/view_manager/public/cpp/view.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view.h
diff --git a/mojo/services/view_manager/public/cpp/view_manager.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager.h
index 5852dd2..5852dd2 100644
--- a/mojo/services/view_manager/public/cpp/view_manager.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager.h
diff --git a/mojo/services/view_manager/public/cpp/view_manager_client_factory.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h
index 35b1245..35b1245 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_client_factory.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h
diff --git a/mojo/services/view_manager/public/cpp/view_manager_context.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h
index 1976598..1976598 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_context.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h
diff --git a/mojo/services/view_manager/public/cpp/view_manager_delegate.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h
index e78e925..e78e925 100644
--- a/mojo/services/view_manager/public/cpp/view_manager_delegate.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h
diff --git a/mojo/services/view_manager/public/cpp/view_observer.h b/third_party/mojo_services/src/view_manager/public/cpp/view_observer.h
index 7430566..7430566 100644
--- a/mojo/services/view_manager/public/cpp/view_observer.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_observer.h
diff --git a/mojo/services/view_manager/public/cpp/view_property.h b/third_party/mojo_services/src/view_manager/public/cpp/view_property.h
index d3a345f..d3a345f 100644
--- a/mojo/services/view_manager/public/cpp/view_property.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_property.h
diff --git a/mojo/services/view_manager/public/cpp/view_tracker.cc b/third_party/mojo_services/src/view_manager/public/cpp/view_tracker.cc
index 317b97a..317b97a 100644
--- a/mojo/services/view_manager/public/cpp/view_tracker.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_tracker.cc
diff --git a/mojo/services/view_manager/public/cpp/view_tracker.h b/third_party/mojo_services/src/view_manager/public/cpp/view_tracker.h
index 05325b7..05325b7 100644
--- a/mojo/services/view_manager/public/cpp/view_tracker.h
+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_tracker.h
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
index 69a454b..69a454b 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
diff --git a/mojo/services/view_manager/public/interfaces/animations.mojom b/third_party/mojo_services/src/view_manager/public/interfaces/animations.mojom
index 59572c4..59572c4 100644
--- a/mojo/services/view_manager/public/interfaces/animations.mojom
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/animations.mojom
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom
index 23238d5..23238d5 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom
diff --git a/mojo/services/view_manager/public/interfaces/view_manager_constants.mojom b/third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom
index 14bd363..14bd363 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager_constants.mojom
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom
diff --git a/mojo/services/window_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
index 14b7d2c..14b7d2c 100644
--- a/mojo/services/window_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
diff --git a/mojo/services/window_manager/public/interfaces/window_manager.mojom b/third_party/mojo_services/src/window_manager/public/interfaces/window_manager.mojom
index e365fb6..e365fb6 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager.mojom
+++ b/third_party/mojo_services/src/window_manager/public/interfaces/window_manager.mojom
diff --git a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom b/third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom
index 6b85632..6b85632 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
+++ b/third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom