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}

BUILD.gn

@@ -701,13 +701,13 @@ group("gn_mojo_targets") {
       "//media/mojo/interfaces:interfaces_python",
       "//media/mojo/services:cdm_service",
       "//media/mojo:tests",
+      "//mojo/application/public/cpp:test_support_standalone",
       "//mojo:tests",
       "//net/interfaces:interfaces_python",
       "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
       "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python",
       "//third_party/mojo/src/mojo/public/python:packaged_application",
       "//third_party/mojo/src/mojo/public/python:packaged_bindings",
-      "//third_party/mojo/src/mojo/public/cpp/application:test_support_standalone",
       "//third_party/mojo_services/src/accessibility/public/interfaces:interfaces_python",
     ]
   }

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",
   ]
 }

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 {
 

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;

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;

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",

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"

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 {

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"

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 {

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"
 

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"
 

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;
 

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"
 

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 {

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",
   ]
 }

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 {
 

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;

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",
+  ]
 }

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 {

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"
 

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"
 

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 {

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;

components/view_manager/BUILD.gn

@@ -82,14 +82,14 @@ 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",
     "//mojo/converters/input_events",
     "//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",

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;
 

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;

components/view_manager/public/cpp/BUILD.gn

@@ -35,17 +35,17 @@ 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",
   ]
 
   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",
   ]
 }
 

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 {