Fork the mojo shell interfaces used by Mandoline.

Per in-person discussions, as long as we have a fork of mojo shell we'll fork the interfaces.

I'll do third_party/mojo/src/mojo/public/java/application in a followup.

TBR=tsepez

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

Cr-Commit-Position: refs/heads/master@{#329965}

51 files changed, 93 insertions, 93 deletions

diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn
index 7440ae6..1973cdd 100644
--- a/components/clipboard/BUILD.gn
+++ b/components/clipboard/BUILD.gn
@@ -14,7 +14,7 @@ source_set("lib") {
 
   deps = [
     "//components/clipboard/public/interfaces",
-    "//third_party/mojo/src/mojo/public/cpp/application",
+    "//mojo/application/public/cpp:application",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
 }
diff --git a/components/clipboard/clipboard_application_delegate.cc b/components/clipboard/clipboard_application_delegate.cc
index 1f6ab9b..ad8fec0 100644
--- a/components/clipboard/clipboard_application_delegate.cc
+++ b/components/clipboard/clipboard_application_delegate.cc
@@ -5,7 +5,7 @@
 #include "components/clipboard/clipboard_application_delegate.h"
 
 #include "components/clipboard/clipboard_standalone_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "mojo/application/public/cpp/application_connection.h"
 
 namespace clipboard {
 
diff --git a/components/clipboard/clipboard_application_delegate.h b/components/clipboard/clipboard_application_delegate.h
index fcbb415..466a02c 100644
--- a/components/clipboard/clipboard_application_delegate.h
+++ b/components/clipboard/clipboard_application_delegate.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/components/clipboard/clipboard_apptest.cc b/components/clipboard/clipboard_apptest.cc
index da45d2e..18a4d07 100644
--- a/components/clipboard/clipboard_apptest.cc
+++ b/components/clipboard/clipboard_apptest.cc
@@ -6,8 +6,8 @@
 #include "base/run_loop.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "mojo/application/application_test_base_chromium.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/common_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 
 using mojo::Array;
 using mojo::Clipboard;
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index e6f55fa..5377e9f9 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -126,6 +126,7 @@ source_set("lib") {
     "//media/blink",
     "//media/mojo",
     "//mojo/application",
+    "//mojo/application/public/interfaces",
     "//mojo/cc",
     "//mojo/common",
     "//mojo/converters/surfaces",
@@ -135,7 +136,6 @@ source_set("lib") {
     "//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/content_handler/public/interfaces",
     "//ui/mojo/events:interfaces",
diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index 576b89a..8151e69 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -7,7 +7,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
diff --git a/components/html_viewer/blink_platform_impl.cc b/components/html_viewer/blink_platform_impl.cc
index d7f5bb8..e0ab1c0 100644
--- a/components/html_viewer/blink_platform_impl.cc
+++ b/components/html_viewer/blink_platform_impl.cc
@@ -23,12 +23,12 @@
 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/connect.h"
 #include "net/base/data_url.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
 
 namespace html_viewer {
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index 6154d34..d4c456b 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -24,6 +24,9 @@
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_media_permission.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/connect.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
@@ -36,10 +39,7 @@
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#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/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 83b06be..ffd549f 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -15,15 +15,15 @@
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/application/public/cpp/lazy_interface_ptr.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
+#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.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"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h"
-#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"
 
 namespace base {
diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc
index d9ae92f..6198e09 100644
--- a/components/html_viewer/html_viewer.cc
+++ b/components/html_viewer/html_viewer.cc
@@ -12,15 +12,15 @@
 #include "components/html_viewer/html_document.h"
 #include "components/html_viewer/setup.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/connect.h"
+#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#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"
 
diff --git a/components/html_viewer/setup.cc b/components/html_viewer/setup.cc
index e49ff72..15af0e6 100644
--- a/components/html_viewer/setup.cc
+++ b/components/html_viewer/setup.cc
@@ -12,9 +12,9 @@
 #include "components/html_viewer/web_media_player_factory.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "gin/v8_initializer.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
diff --git a/components/html_viewer/web_media_player_factory.cc b/components/html_viewer/web_media_player_factory.cc
index 0de85f3..2898feb 100644
--- a/components/html_viewer/web_media_player_factory.cc
+++ b/components/html_viewer/web_media_player_factory.cc
@@ -21,8 +21,8 @@
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
+#include "mojo/application/public/cpp/connect.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 
 using mojo::ServiceProviderPtr;
 
diff --git a/components/native_viewport/main.cc b/components/native_viewport/main.cc
index 1ebfb27..7cc3323 100644
--- a/components/native_viewport/main.cc
+++ b/components/native_viewport/main.cc
@@ -9,12 +9,12 @@
 #include "components/native_viewport/native_viewport_impl.h"
 #include "components/native_viewport/public/cpp/args.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
 #include "ui/events/event_switches.h"
 #include "ui/gl/gl_surface.h"
 
diff --git a/components/native_viewport/native_viewport_impl.cc b/components/native_viewport/native_viewport_impl.cc
index 2f85500..b1a02fc 100644
--- a/components/native_viewport/native_viewport_impl.cc
+++ b/components/native_viewport/native_viewport_impl.cc
@@ -11,8 +11,8 @@
 #include "base/time/time.h"
 #include "components/gles2/gpu_state.h"
 #include "components/native_viewport/platform_viewport_headless.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 #include "ui/events/event.h"
 
 namespace native_viewport {
diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn
index 553950c..f853cb8 100644
--- a/components/resource_provider/public/cpp/BUILD.gn
+++ b/components/resource_provider/public/cpp/BUILD.gn
@@ -14,11 +14,11 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
+    "//mojo/application/public/cpp:application",
+    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/platform_handle",
-    "//third_party/mojo/src/mojo/public/cpp/application",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/public/cpp/system",
-    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc
index a387e20..7f4c938 100644
--- a/components/resource_provider/public/cpp/resource_loader.cc
+++ b/components/resource_provider/public/cpp/resource_loader.cc
@@ -6,10 +6,10 @@
 
 #include "base/bind.h"
 #include "base/files/file.h"
+#include "mojo/application/public/cpp/connect.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
 
 namespace resource_provider {
 
diff --git a/components/resource_provider/public/cpp/resource_loader.h b/components/resource_provider/public/cpp/resource_loader.h
index 1162180..97f2b2ae 100644
--- a/components/resource_provider/public/cpp/resource_loader.h
+++ b/components/resource_provider/public/cpp/resource_loader.h
@@ -13,10 +13,10 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/platform_handle/platform_handle.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/handle.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace base {
 class File;
diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn
index 7bf8e85..d3cb620 100644
--- a/components/resource_provider/public/interfaces/BUILD.gn
+++ b/components/resource_provider/public/interfaces/BUILD.gn
@@ -10,5 +10,7 @@ mojom("interfaces") {
     "resource_provider.mojom",
   ]
 
-  mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
+  deps = [
+    "//mojo/application/public/interfaces",
+  ]
 }
diff --git a/components/resource_provider/resource_provider_app.cc b/components/resource_provider/resource_provider_app.cc
index 1373d63..c9ac5d5 100644
--- a/components/resource_provider/resource_provider_app.cc
+++ b/components/resource_provider/resource_provider_app.cc
@@ -6,7 +6,7 @@
 
 #include "components/resource_provider/file_utils.h"
 #include "components/resource_provider/resource_provider_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "mojo/application/public/cpp/application_connection.h"
 #include "url/gurl.h"
 
 namespace resource_provider {
diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h
index 55bb940..ac99205 100644
--- a/components/resource_provider/resource_provider_app.h
+++ b/components/resource_provider/resource_provider_app.h
@@ -8,9 +8,9 @@
 #include <map>
 
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/weak_binding_set.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc
index 7853e32..acd62eb 100644
--- a/components/resource_provider/resource_provider_apptest.cc
+++ b/components/resource_provider/resource_provider_apptest.cc
@@ -10,11 +10,11 @@
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
 #include "mojo/application/application_test_base_chromium.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 
diff --git a/components/surfaces/surfaces_impl.h b/components/surfaces/surfaces_impl.h
index 5ff375d..ef39234 100644
--- a/components/surfaces/surfaces_impl.h
+++ b/components/surfaces/surfaces_impl.h
@@ -11,8 +11,8 @@
 #include "components/gpu/public/interfaces/command_buffer.mojom.h"
 #include "components/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
 #include "components/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/common/weak_binding_set.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace cc {
diff --git a/components/surfaces/surfaces_service_application.h b/components/surfaces/surfaces_service_application.h
index ba55d0c..9101c9d 100644
--- a/components/surfaces/surfaces_service_application.h
+++ b/components/surfaces/surfaces_service_application.h
@@ -9,9 +9,9 @@
 #include "cc/surfaces/surface_manager.h"
 #include "components/surfaces/public/interfaces/display.mojom.h"
 #include "components/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/tracing_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index 5bc0ae4f..0bd81f8 100644
--- a/components/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
@@ -82,6 +82,7 @@ source_set("view_manager_lib") {
     "//components/view_manager/public/interfaces",
     "//components/window_manager/public/interfaces",
     "//mojo/application",
+    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
@@ -89,7 +90,6 @@ source_set("view_manager_lib") {
     "//mojo/converters/surfaces",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
-    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/gfx",
@@ -147,12 +147,12 @@ test("tests") {
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
     "//components/window_manager/public/interfaces",
+    "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/events:interfaces",
     "//testing/gtest",
diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
index 5a9657c..ae88b1a 100644
--- a/components/view_manager/connection_manager.cc
+++ b/components/view_manager/connection_manager.cc
@@ -13,9 +13,9 @@
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
 #include "components/view_manager/view_manager_service_impl.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 
 using mojo::ConnectionSpecificId;
 
diff --git a/components/view_manager/display_manager.cc b/components/view_manager/display_manager.cc
index 716bb82..0155ab2 100644
--- a/components/view_manager/display_manager.cc
+++ b/components/view_manager/display_manager.cc
@@ -11,12 +11,12 @@
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/converters/transform/transform_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 
 using mojo::Rect;
 using mojo::Size;
diff --git a/components/view_manager/public/cpp/BUILD.gn b/components/view_manager/public/cpp/BUILD.gn
index e1bd479..17133b2 100644
--- a/components/view_manager/public/cpp/BUILD.gn
+++ b/components/view_manager/public/cpp/BUILD.gn
@@ -35,6 +35,8 @@ mojo_sdk_source_set("cpp") {
     "../interfaces",
     "//components/surfaces/public/interfaces:surface_id",
     "//components/window_manager/public/interfaces",
+    "//mojo/application/public/cpp:application",
+    "//mojo/application/public/interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/mojo/geometry:interfaces",
     "//base",
@@ -42,10 +44,8 @@ mojo_sdk_source_set("cpp") {
 
   mojo_sdk_deps = [
     "mojo/public/c/gles2:headers",
-    "mojo/public/cpp/application",
     "mojo/public/cpp/bindings:bindings",
     "mojo/public/cpp/system",
-    "mojo/public/interfaces/application",
   ]
 }
 
diff --git a/components/view_manager/public/cpp/lib/view.cc b/components/view_manager/public/cpp/lib/view.cc
index 1cde9e8..5cdb8c9 100644
--- a/components/view_manager/public/cpp/lib/view.cc
+++ b/components/view_manager/public/cpp/lib/view.cc
@@ -11,7 +11,7 @@
 #include "components/view_manager/public/cpp/lib/view_private.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "components/view_manager/public/cpp/view_tracker.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_factory.cc b/components/view_manager/public/cpp/lib/view_manager_client_factory.cc
index 81eccbc..2342915 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_factory.cc
+++ b/components/view_manager/public/cpp/lib/view_manager_client_factory.cc
@@ -5,7 +5,7 @@
 #include "components/view_manager/public/cpp/view_manager_client_factory.h"
 
 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
index e22b4d7..5938c9a 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
@@ -8,11 +8,11 @@
 #include "components/view_manager/public/cpp/util.h"
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_observer.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/connect.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
diff --git a/components/view_manager/public/cpp/lib/view_manager_context.cc b/components/view_manager/public/cpp/lib/view_manager_context.cc
index f1fdd4f..1f0e878 100644
--- a/components/view_manager/public/cpp/lib/view_manager_context.cc
+++ b/components/view_manager/public/cpp/lib/view_manager_context.cc
@@ -5,7 +5,7 @@
 #include "components/view_manager/public/cpp/view_manager_context.h"
 
 #include "components/window_manager/public/interfaces/window_manager.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace mojo {
diff --git a/components/view_manager/public/cpp/tests/BUILD.gn b/components/view_manager/public/cpp/tests/BUILD.gn
index 393b0e2..c5a8680 100644
--- a/components/view_manager/public/cpp/tests/BUILD.gn
+++ b/components/view_manager/public/cpp/tests/BUILD.gn
@@ -20,9 +20,9 @@ test("mojo_view_manager_lib_unittests") {
     # TODO(vtl): These non-public deps are illegal here. This should be
     # converted to an apptest.
     "//mojo/application",
+    "//mojo/application/public/cpp:application",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/application",
     "//mojo/public/cpp/system",
     "//mojo/services/geometry/public/cpp",
     "//mojo/services/geometry/public/interfaces",
diff --git a/components/view_manager/public/cpp/view.h b/components/view_manager/public/cpp/view.h
index e2e81cf..cbf9e78 100644
--- a/components/view_manager/public/cpp/view.h
+++ b/components/view_manager/public/cpp/view.h
@@ -13,9 +13,9 @@
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 
 namespace mojo {
diff --git a/components/view_manager/public/cpp/view_manager_client_factory.h b/components/view_manager/public/cpp/view_manager_client_factory.h
index eaf42a4..0fdfb406 100644
--- a/components/view_manager/public/cpp/view_manager_client_factory.h
+++ b/components/view_manager/public/cpp/view_manager_client_factory.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
 
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 
 namespace mojo {
 
diff --git a/components/view_manager/public/cpp/view_manager_context.h b/components/view_manager/public/cpp/view_manager_context.h
index 09b1ce3..c24d099 100644
--- a/components/view_manager/public/cpp/view_manager_context.h
+++ b/components/view_manager/public/cpp/view_manager_context.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 
 namespace mojo {
diff --git a/components/view_manager/public/cpp/view_manager_delegate.h b/components/view_manager/public/cpp/view_manager_delegate.h
index 738502f..be252ce 100644
--- a/components/view_manager/public/cpp/view_manager_delegate.h
+++ b/components/view_manager/public/cpp/view_manager_delegate.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
diff --git a/components/view_manager/public/interfaces/BUILD.gn b/components/view_manager/public/interfaces/BUILD.gn
index 982c363..f17b2e04 100644
--- a/components/view_manager/public/interfaces/BUILD.gn
+++ b/components/view_manager/public/interfaces/BUILD.gn
@@ -14,11 +14,10 @@ mojom("interfaces") {
 
   import_dirs = [ get_path_info("../../../..", "abspath") ]
 
-  mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
-
   deps = [
     "//components/native_viewport/public/interfaces",
     "//components/surfaces/public/interfaces:surface_id",
+    "//mojo/application/public/interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/components/view_manager/public/interfaces/view_manager.mojom b/components/view_manager/public/interfaces/view_manager.mojom
index cb02ea6..0dcd7df 100644
--- a/components/view_manager/public/interfaces/view_manager.mojom
+++ b/components/view_manager/public/interfaces/view_manager.mojom
@@ -7,7 +7,7 @@ module mojo;
 import "components/native_viewport/public/interfaces/native_viewport.mojom";
 import "components/surfaces/public/interfaces/surface_id.mojom";
 import "components/view_manager/public/interfaces/view_manager_constants.mojom";
-import "mojo/public/interfaces/application/service_provider.mojom";
+import "mojo/application/public/interfaces/service_provider.mojom";
 import "ui/mojo/events/input_events.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc
index a068d2a..eb5fceb2 100644
--- a/components/view_manager/view_manager_app.cc
+++ b/components/view_manager/view_manager_app.cc
@@ -9,10 +9,10 @@
 #include "components/view_manager/display_manager.h"
 #include "components/view_manager/view_manager_service_impl.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationImpl;
diff --git a/components/view_manager/view_manager_app.h b/components/view_manager/view_manager_app.h
index fc16a0c..ebf6645 100644
--- a/components/view_manager/view_manager_app.h
+++ b/components/view_manager/view_manager_app.h
@@ -9,9 +9,9 @@
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/tracing_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
diff --git a/components/view_manager/view_manager_client_apptest.cc b/components/view_manager/view_manager_client_apptest.cc
index 0002b9f..54a335b 100644
--- a/components/view_manager/view_manager_client_apptest.cc
+++ b/components/view_manager/view_manager_client_apptest.cc
@@ -17,10 +17,10 @@
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
 namespace mojo {
diff --git a/components/view_manager/view_manager_service_apptest.cc b/components/view_manager/view_manager_service_apptest.cc
index bb533c7..d438043 100644
--- a/components/view_manager/view_manager_service_apptest.cc
+++ b/components/view_manager/view_manager_service_apptest.cc
@@ -11,8 +11,8 @@
 #include "components/window_manager/public/interfaces/window_manager.mojom.h"
 #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
diff --git a/components/view_manager/view_manager_service_unittest.cc b/components/view_manager/view_manager_service_unittest.cc
index 43274be..1e06be6 100644
--- a/components/view_manager/view_manager_service_unittest.cc
+++ b/components/view_manager/view_manager_service_unittest.cc
@@ -19,9 +19,9 @@
 #include "components/view_manager/view_manager_service_impl.h"
 #include "components/window_manager/public/interfaces/window_manager.mojom.h"
 #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 
 using mojo::Array;
diff --git a/components/window_manager/BUILD.gn b/components/window_manager/BUILD.gn
index e92bb6a..e39e89f 100644
--- a/components/window_manager/BUILD.gn
+++ b/components/window_manager/BUILD.gn
@@ -20,10 +20,10 @@ source_set("lib") {
     "//components/view_manager/public/cpp",
     "//components/window_manager/public/interfaces",
     "//mojo/application",
+    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/gfx/geometry",
     "//ui/mojo/events:interfaces",
   ]
diff --git a/components/window_manager/main.cc b/components/window_manager/main.cc
index 5f50026..9efd4c5 100644
--- a/components/window_manager/main.cc
+++ b/components/window_manager/main.cc
@@ -8,10 +8,10 @@
 #include "components/window_manager/window_manager_app.h"
 #include "components/window_manager/window_manager_delegate.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 
 // ApplicationDelegate implementation file for WindowManager users (e.g.
 // core window manager tests) that do not want to provide their own
diff --git a/components/window_manager/public/interfaces/BUILD.gn b/components/window_manager/public/interfaces/BUILD.gn
index 9d1df9e..5d4aa67 100644
--- a/components/window_manager/public/interfaces/BUILD.gn
+++ b/components/window_manager/public/interfaces/BUILD.gn
@@ -11,9 +11,8 @@ mojom("interfaces") {
     "window_manager_internal.mojom",
   ]
 
-  mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
-
   deps = [
+    "//mojo/application/public/interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/components/window_manager/public/interfaces/window_manager.mojom b/components/window_manager/public/interfaces/window_manager.mojom
index 0ff82fe..eb37224 100644
--- a/components/window_manager/public/interfaces/window_manager.mojom
+++ b/components/window_manager/public/interfaces/window_manager.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/public/interfaces/application/service_provider.mojom";
+import "mojo/application/public/interfaces/service_provider.mojom";
 
 interface WindowManager {
   // Requests the WindowManager to embed the app for |url| at an appropriate
diff --git a/components/window_manager/window_manager_app.cc b/components/window_manager/window_manager_app.cc
index da40ef7..57a4fecf 100644
--- a/components/window_manager/window_manager_app.cc
+++ b/components/window_manager/window_manager_app.cc
@@ -9,10 +9,10 @@
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
 #include "components/window_manager/window_manager_delegate.h"
+#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
 
 using mojo::ApplicationConnection;
 using mojo::Id;
diff --git a/components/window_manager/window_manager_app.h b/components/window_manager/window_manager_app.h
index 81a2e46..8b2d89f 100644
--- a/components/window_manager/window_manager_app.h
+++ b/components/window_manager/window_manager_app.h
@@ -15,8 +15,8 @@
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "components/window_manager/window_manager_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 #include "ui/mojo/events/input_events.mojom.h"
diff --git a/components/window_manager/window_manager_apptest.cc b/components/window_manager/window_manager_apptest.cc
index f7915fd..0e9cc75 100644
--- a/components/window_manager/window_manager_apptest.cc
+++ b/components/window_manager/window_manager_apptest.cc
@@ -9,9 +9,9 @@
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/window_manager/public/interfaces/window_manager.mojom.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 
 namespace mojo {
diff --git a/components/window_manager/window_manager_delegate.h b/components/window_manager/window_manager_delegate.h
index 71e154c..1ea7923 100644
--- a/components/window_manager/window_manager_delegate.h
+++ b/components/window_manager/window_manager_delegate.h
@@ -5,8 +5,8 @@
 #ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
 #define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_
 
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 #include "ui/mojo/events/input_events.mojom.h"
 #include "ui/mojo/events/input_key_codes.mojom.h"