Move mojo/application/public -> mojo/shell/public

TBR=sky@chromium.org
http://crbug.com/575308

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

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

9 files changed, 21 insertions, 21 deletions

diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index 51d3b5a..97d1ee4 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/BUILD.gn
@@ -17,7 +17,7 @@ if (is_android) {
     deps = [
       ":java_library",
       ":resource_provider_lib",
-      "//mojo/application/public/cpp",
+      "//mojo/shell/public/cpp",
     ]
   }
 
@@ -33,10 +33,10 @@ if (is_android) {
       "//base",
       "//build/config/sanitizers:deps",
       "//components/resource_provider/public/interfaces",
-      "//mojo/application/public/cpp",
       "//mojo/environment:chromium",
       "//mojo/platform_handle:for_shared_library",
       "//mojo/public/c/system:for_shared_library",
+      "//mojo/shell/public/cpp",
       "//url",
     ]
   }
@@ -73,8 +73,8 @@ if (is_android) {
       ":lib",
       "//base",
       "//components/resource_provider/public/interfaces",
-      "//mojo/application/public/cpp",
       "//mojo/environment:chromium",
+      "//mojo/shell/public/cpp",
       "//url",
     ]
   }
@@ -93,10 +93,10 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//url",
   ]
 }
@@ -137,8 +137,8 @@ mojo_native_application("apptests") {
     "//base/test:test_config",
     "//components/resource_provider/public/cpp",
     "//components/resource_provider/public/interfaces",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
diff --git a/components/resource_provider/DEPS b/components/resource_provider/DEPS
index 5780d73..bae258a 100644
--- a/components/resource_provider/DEPS
+++ b/components/resource_provider/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/platform_handle",
diff --git a/components/resource_provider/main.cc b/components/resource_provider/main.cc
index 60b78c1..92b4c99 100644
--- a/components/resource_provider/main.cc
+++ b/components/resource_provider/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "components/resource_provider/resource_provider_app.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn
index 0842a71..3ac9ffb 100644
--- a/components/resource_provider/public/cpp/BUILD.gn
+++ b/components/resource_provider/public/cpp/BUILD.gn
@@ -11,11 +11,11 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc
index 47f7db1..21ce94d 100644
--- a/components/resource_provider/public/cpp/resource_loader.cc
+++ b/components/resource_provider/public/cpp/resource_loader.cc
@@ -9,12 +9,12 @@
 
 #include "base/bind.h"
 #include "base/files/file.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.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 "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace resource_provider {
 namespace {
diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn
index d7abe36..9a70453 100644
--- a/components/resource_provider/public/interfaces/BUILD.gn
+++ b/components/resource_provider/public/interfaces/BUILD.gn
@@ -10,6 +10,6 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 }
diff --git a/components/resource_provider/resource_provider_app.cc b/components/resource_provider/resource_provider_app.cc
index 56506e1..29cc400 100644
--- a/components/resource_provider/resource_provider_app.cc
+++ b/components/resource_provider/resource_provider_app.cc
@@ -8,7 +8,7 @@
 
 #include "components/resource_provider/file_utils.h"
 #include "components/resource_provider/resource_provider_impl.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/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 6bd9f9f..deeb218 100644
--- a/components/resource_provider/resource_provider_app.h
+++ b/components/resource_provider/resource_provider_app.h
@@ -9,11 +9,11 @@
 
 #include "base/macros.h"
 #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 "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc
index 8e7c4d8..86b7577 100644
--- a/components/resource_provider/resource_provider_apptest.cc
+++ b/components/resource_provider/resource_provider_apptest.cc
@@ -11,14 +11,14 @@
 #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/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"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace resource_provider {
 namespace {