Remove duplicate application cpp files in mojo/application.

Some of these files were forked in the initial Mandoline landing. After we forked the application code, we now had two implementations of some of these files. We only need one.

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

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

22 files changed, 33 insertions, 64 deletions

diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn
index 4c11cb5..4a351a7 100644
--- a/components/clipboard/BUILD.gn
+++ b/components/clipboard/BUILD.gn
@@ -27,10 +27,7 @@ mojo_native_application("clipboard") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application",
-    "//mojo/common",
-    "//mojo/environment:chromium",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//mojo/application/public/cpp",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
   ]
 }
@@ -47,10 +44,7 @@ mojo_native_application("apptests") {
   deps = [
     "//base",
     "//components/clipboard/public/interfaces",
-    "//mojo/application",
-    "//mojo/application:test_support",
-    "//mojo/common",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//mojo/application/public/cpp:test_support",
   ]
 
   data_deps = [ ":clipboard($default_toolchain)" ]
diff --git a/components/clipboard/clipboard_apptest.cc b/components/clipboard/clipboard_apptest.cc
index 18a4d07..1f00970 100644
--- a/components/clipboard/clipboard_apptest.cc
+++ b/components/clipboard/clipboard_apptest.cc
@@ -5,8 +5,8 @@
 #include "base/bind.h"
 #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/application/public/cpp/application_test_base.h"
 #include "mojo/common/common_type_converters.h"
 
 using mojo::Array;
diff --git a/components/clipboard/main.cc b/components/clipboard/main.cc
index 85f942a..5934496 100644
--- a/components/clipboard/main.cc
+++ b/components/clipboard/main.cc
@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 
 #include "components/clipboard/clipboard_application_delegate.h"
-#include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(
-      new clipboard::ClipboardApplicationDelegate);
+  mojo::ApplicationRunner runner(new clipboard::ClipboardApplicationDelegate);
   return runner.Run(shell_handle);
 }
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index 9fdd432..7d85359 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -125,17 +125,14 @@ source_set("lib") {
     "//media",
     "//media/blink",
     "//media/mojo",
-    "//mojo/application",
-    "//mojo/application/public/interfaces",
+    "//mojo/application/public/cpp",
     "//mojo/cc",
-    "//mojo/common",
     "//mojo/converters/surfaces",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/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_services/src/accessibility/public/interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/events",
@@ -221,8 +218,7 @@ mojo_native_application("apptests") {
 
   deps = [
     "//base",
-    "//mojo/application",
-    "//mojo/application:test_support",
+    "//mojo/application/public/cpp:test_support",
     "//net:test_support",
     "//testing/gtest",
     "//third_party/mojo_services/src/accessibility/public/interfaces",
diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index 8151e69..32ce88b 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -6,8 +6,8 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/application/application_test_base_chromium.h"
 #include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/application_test_base.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/html_viewer.cc b/components/html_viewer/html_viewer.cc
index 80e5aad..dd20434 100644
--- a/components/html_viewer/html_viewer.cc
+++ b/components/html_viewer/html_viewer.cc
@@ -11,10 +11,10 @@
 #include "base/strings/utf_string_conversions.h"
 #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/application_runner.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
@@ -161,6 +161,6 @@ class HTMLViewer : public mojo::ApplicationDelegate,
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
+  mojo::ApplicationRunner runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index 9b02177..66c2d78 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/BUILD.gn
@@ -84,7 +84,7 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application",
+    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//url",
@@ -127,11 +127,8 @@ mojo_application_package("apptests") {
     "//base/test:test_config",
     "//components/resource_provider/public/cpp",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application",
-    "//mojo/application:test_support",
-    "//mojo/common",
+    "//mojo/application/public/cpp:test_support",
     "//mojo/platform_handle",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
   ]
 
   data_deps = [ ":resource_provider" ]
diff --git a/components/resource_provider/android/android_hooks.cc b/components/resource_provider/android/android_hooks.cc
index f51a495..c84730f 100644
--- a/components/resource_provider/android/android_hooks.cc
+++ b/components/resource_provider/android/android_hooks.cc
@@ -36,7 +36,7 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   }
 
   // There cannot be two AtExitManagers at the same time. Remove the one from
-  // LibraryLoader as ApplicationRunnerChromium also uses one.
+  // LibraryLoader as ApplicationRunner also uses one.
   base::android::LibraryLoaderExitHook();
 
   return JNI_VERSION_1_4;
diff --git a/components/resource_provider/main.cc b/components/resource_provider/main.cc
index 413a21b..ad65654 100644
--- a/components/resource_provider/main.cc
+++ b/components/resource_provider/main.cc
@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 
 #include "components/resource_provider/resource_provider_app.h"
-#include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(
-      new resource_provider::ResourceProviderApp);
+  mojo::ApplicationRunner runner(new resource_provider::ResourceProviderApp);
   return runner.Run(shell_handle);
 }
diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc
index acd62eb..5484368 100644
--- a/components/resource_provider/resource_provider_apptest.cc
+++ b/components/resource_provider/resource_provider_apptest.cc
@@ -9,9 +9,9 @@
 #include "base/run_loop.h"
 #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/application_test_base.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"
diff --git a/components/surfaces/BUILD.gn b/components/surfaces/BUILD.gn
index 16ad289..6a461db 100644
--- a/components/surfaces/BUILD.gn
+++ b/components/surfaces/BUILD.gn
@@ -43,14 +43,11 @@ source_set("lib") {
     "//components/gpu/public/interfaces",
     "//components/surfaces/public/interfaces",
     "//gpu/command_buffer/client:gles2_interface",
-    "//mojo/application",
-    "//mojo/common",
+    "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
     "//third_party/mojo/src/mojo/public/c/gles2",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//third_party/mojo/src/mojo/public/cpp/environment",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/components/surfaces/main.cc b/components/surfaces/main.cc
index 5838122..c052a26 100644
--- a/components/surfaces/main.cc
+++ b/components/surfaces/main.cc
@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 
 #include "components/surfaces/surfaces_service_application.h"
-#include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(
-      new surfaces::SurfacesServiceApplication);
+  mojo::ApplicationRunner runner(new surfaces::SurfacesServiceApplication);
   return runner.Run(shell_handle);
 }
diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index e38c421..cc80fb7 100644
--- a/components/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
@@ -15,10 +15,8 @@ mojo_native_application("view_manager") {
     ":view_manager_lib",
     "//base",
     "//components/view_manager/public/interfaces",
-    "//mojo/application",
+    "//mojo/application/public/cpp",
     "//mojo/converters/geometry",
-    "//mojo/environment:chromium",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
   ]
 }
 
@@ -79,14 +77,11 @@ source_set("view_manager_lib") {
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
     "//components/view_manager/native_viewport",
-    "//mojo/application",
-    "//mojo/application/public/interfaces",
-    "//mojo/common",
+    "//mojo/application/public/cpp",
     "//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",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/events:interfaces",
@@ -171,10 +166,7 @@ mojo_native_application("apptests") {
     "//base/test:test_config",
     "//components/view_manager/public/cpp",
     "//components/view_manager/public/interfaces",
-    "//mojo/application",
-    "//mojo/application:test_support",
-    "//mojo/common",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
+    "//mojo/application/public/cpp:test_support",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
diff --git a/components/view_manager/main.cc b/components/view_manager/main.cc
index 5c8735c..9039251 100644
--- a/components/view_manager/main.cc
+++ b/components/view_manager/main.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "components/view_manager/view_manager_app.h"
-#include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(new view_manager::ViewManagerApp);
+  mojo::ApplicationRunner runner(new view_manager::ViewManagerApp);
   return runner.Run(shell_handle);
 }
diff --git a/components/view_manager/native_viewport/BUILD.gn b/components/view_manager/native_viewport/BUILD.gn
index 403a6e5..4783d4d 100644
--- a/components/view_manager/native_viewport/BUILD.gn
+++ b/components/view_manager/native_viewport/BUILD.gn
@@ -45,7 +45,7 @@ if (is_android) {
       "//components/gles2",
       "//components/view_manager/public/cpp",
       "//components/view_manager/public/interfaces",
-      "//mojo/application",
+      "//mojo/application/public/cpp",
       "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
       "//ui/events",
       "//ui/events/platform",
@@ -81,12 +81,10 @@ source_set("lib") {
     "//components/gles2",
     "//components/view_manager/public/interfaces",
     "//gpu/command_buffer/service",
-    "//mojo/application",
-    "//mojo/common",
+    "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
-    "//mojo/environment:chromium",
     "//ui/events",
     "//ui/events/platform",
     "//ui/gfx",
diff --git a/components/view_manager/native_viewport/main.cc b/components/view_manager/native_viewport/main.cc
index 8575d57..5858c03 100644
--- a/components/view_manager/native_viewport/main.cc
+++ b/components/view_manager/native_viewport/main.cc
@@ -4,11 +4,11 @@
 
 #include "base/message_loop/message_loop.h"
 #include "components/view_manager/native_viewport/native_viewport_application_delegate.h"
-#include "mojo/application/application_runner_chromium.h"
+#include "mojo/application/public/cpp/application_runner.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(
+  mojo::ApplicationRunner runner(
       new native_viewport::NativeViewportApplicationDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(shell_handle);
diff --git a/components/view_manager/native_viewport/native_viewport_application_delegate.h b/components/view_manager/native_viewport/native_viewport_application_delegate.h
index 79e3a67..08c695ad 100644
--- a/components/view_manager/native_viewport/native_viewport_application_delegate.h
+++ b/components/view_manager/native_viewport/native_viewport_application_delegate.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "components/gles2/gpu_impl.h"
 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"
-#include "mojo/application/app_lifetime_helper.h"
+#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/common/tracing_impl.h"
diff --git a/components/view_manager/native_viewport/native_viewport_impl.h b/components/view_manager/native_viewport/native_viewport_impl.h
index c89f9e5..bcf6a05 100644
--- a/components/view_manager/native_viewport/native_viewport_impl.h
+++ b/components/view_manager/native_viewport/native_viewport_impl.h
@@ -13,7 +13,7 @@
 #include "components/view_manager/native_viewport/onscreen_context_provider.h"
 #include "components/view_manager/native_viewport/platform_viewport.h"
 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"
-#include "mojo/application/app_lifetime_helper.h"
+#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/components/view_manager/public/cpp/tests/BUILD.gn b/components/view_manager/public/cpp/tests/BUILD.gn
index 749b9a9..9b61e4f 100644
--- a/components/view_manager/public/cpp/tests/BUILD.gn
+++ b/components/view_manager/public/cpp/tests/BUILD.gn
@@ -19,10 +19,8 @@ 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",
     "//mojo/edk/system",
-    "//mojo/environment:chromium",
     "//mojo/public/cpp/system",
     "//mojo/services/geometry/public/cpp",
     "//mojo/services/geometry/public/interfaces",
diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc
index 47fe343..a2e45c3 100644
--- a/components/view_manager/view_manager_app.cc
+++ b/components/view_manager/view_manager_app.cc
@@ -8,9 +8,9 @@
 #include "components/view_manager/connection_manager.h"
 #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/application/public/cpp/application_runner.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 
diff --git a/components/view_manager/view_manager_client_apptest.cc b/components/view_manager/view_manager_client_apptest.cc
index 9e498e2..db34f0e 100644
--- a/components/view_manager/view_manager_client_apptest.cc
+++ b/components/view_manager/view_manager_client_apptest.cc
@@ -16,10 +16,10 @@
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
 #include "components/view_manager/public/cpp/view_observer.h"
-#include "mojo/application/application_test_base_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/application_test_base.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
diff --git a/components/view_manager/view_manager_service_apptest.cc b/components/view_manager/view_manager_service_apptest.cc
index 0d71c11..95a4a9e 100644
--- a/components/view_manager/view_manager_service_apptest.cc
+++ b/components/view_manager/view_manager_service_apptest.cc
@@ -9,9 +9,9 @@
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
 #include "components/view_manager/test_change_tracker.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/application_test_base.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;