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}
author: ben <ben@chromium.org> 2016-01-11 18:44:08 -0800
committer: Commit bot <commit-bot@chromium.org> 2016-01-12 02:44:59 +0000
commit: 273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch)
tree: 25da3f1a02f1f9d5f129ba8d794d20b51355a07b /mojo
parent: 9c1122c7163411be938195ba546460ba54d33b00 (diff)
download: chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz
chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2
126 files changed, 318 insertions, 318 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index abd063e..df7e878 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -71,10 +71,10 @@ group("tests") {
   testonly = true
   deps = [
     "//ipc/mojo:ipc_mojo_unittests",
-    "//mojo/application/public/cpp/tests:mojo_public_application_unittests",
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/edk/js/test:js_unittests",
+    "//mojo/shell/public/cpp/tests:mojo_public_application_unittests",
 
     # TODO(use_chrome_edk):
     #"//mojo/edk/js/test:js_integration_tests2",
diff --git a/mojo/common/DEPS b/mojo/common/DEPS
index 6dd6560..21f3b0d 100644
--- a/mojo/common/DEPS
+++ b/mojo/common/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   # common must not depend on embedder.
   "-mojo",
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
   "+mojo/common",
   "+mojo/message_pump",
   "+mojo/public",
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index b814cf5..dd9a649 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -204,11 +204,11 @@
       'type': 'none',
       'variables': {
         'mojom_files': [
-          'application/public/interfaces/application.mojom',
-          'application/public/interfaces/application_manager.mojom',
-          'application/public/interfaces/content_handler.mojom',
-          'application/public/interfaces/service_provider.mojom',
-          'application/public/interfaces/shell.mojom',
+          'shell/public/interfaces/application.mojom',
+          'shell/public/interfaces/application_manager.mojom',
+          'shell/public/interfaces/content_handler.mojom',
+          'shell/public/interfaces/service_provider.mojom',
+          'shell/public/interfaces/shell.mojom',
         ],
       },
       'dependencies': [
@@ -220,32 +220,32 @@
       'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
-      # GN version: //mojo/application/public/cpp
+      # GN version: //mojo/shell/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
-        'application/public/cpp/app_lifetime_helper.h',
-        'application/public/cpp/application_connection.h',
-        'application/public/cpp/application_delegate.h',
-        'application/public/cpp/application_impl.h',
-        'application/public/cpp/application_runner.h',
-        'application/public/cpp/connect.h',
-        'application/public/cpp/initialize_base_and_icu.cc',
-        'application/public/cpp/initialize_base_and_icu.h',
-        'application/public/cpp/interface_factory.h',
-        'application/public/cpp/interface_factory_impl.h',
-        'application/public/cpp/lib/app_lifetime_helper.cc',
-        'application/public/cpp/lib/application_delegate.cc',
-        'application/public/cpp/lib/application_impl.cc',
-        'application/public/cpp/lib/application_runner.cc',
-        'application/public/cpp/lib/interface_factory_connector.h',
-        'application/public/cpp/lib/service_connector_registry.cc',
-        'application/public/cpp/lib/service_connector_registry.h',
-        'application/public/cpp/lib/service_provider_impl.cc',
-        'application/public/cpp/lib/service_registry.cc',
-        'application/public/cpp/lib/service_registry.h',
-        'application/public/cpp/service_connector.h',
-        'application/public/cpp/service_provider_impl.h',
+        'shell/public/cpp/app_lifetime_helper.h',
+        'shell/public/cpp/application_connection.h',
+        'shell/public/cpp/application_delegate.h',
+        'shell/public/cpp/application_impl.h',
+        'shell/public/cpp/application_runner.h',
+        'shell/public/cpp/connect.h',
+        'shell/public/cpp/initialize_base_and_icu.cc',
+        'shell/public/cpp/initialize_base_and_icu.h',
+        'shell/public/cpp/interface_factory.h',
+        'shell/public/cpp/interface_factory_impl.h',
+        'shell/public/cpp/lib/app_lifetime_helper.cc',
+        'shell/public/cpp/lib/application_delegate.cc',
+        'shell/public/cpp/lib/application_impl.cc',
+        'shell/public/cpp/lib/application_runner.cc',
+        'shell/public/cpp/lib/interface_factory_connector.h',
+        'shell/public/cpp/lib/service_connector_registry.cc',
+        'shell/public/cpp/lib/service_connector_registry.h',
+        'shell/public/cpp/lib/service_provider_impl.cc',
+        'shell/public/cpp/lib/service_registry.cc',
+        'shell/public/cpp/lib/service_registry.h',
+        'shell/public/cpp/service_connector.h',
+        'shell/public/cpp/service_provider_impl.h',
       ],
       'dependencies': [
         '../base/base.gyp:base_i18n',
@@ -281,7 +281,7 @@
       ],
     },
     {
-      # GN version: //mojo/application/public/cpp/tests
+      # GN version: //mojo/shell/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
@@ -293,7 +293,7 @@
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
-        'application/public/cpp/tests/service_registry_unittest.cc',
+        'shell/public/cpp/tests/service_registry_unittest.cc',
       ],
     },
   ],
diff --git a/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
index faf86a6..26dca60 100644
--- a/mojo/public/cpp/bindings/tests/versioning_apptest.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
@@ -5,10 +5,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
index 42953c8..cd41541 100644
--- a/mojo/public/cpp/bindings/tests/versioning_test_service.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
@@ -6,14 +6,14 @@
 
 #include <map>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn
index 4166e29..ca7205c 100644
--- a/mojo/runner/BUILD.gn
+++ b/mojo/runner/BUILD.gn
@@ -128,7 +128,6 @@ source_set("lib") {
     "//components/devtools_service/public/cpp",
     "//components/devtools_service/public/interfaces",
     "//components/tracing:startup_tracing",
-    "//mojo/application/public/cpp",
     "//mojo/message_pump",
     "//mojo/runner/child:interfaces",
     "//mojo/runner/host:lib",
@@ -137,6 +136,7 @@ source_set("lib") {
     "//mojo/services/tracing/public/interfaces",
     "//mojo/shell",
     "//mojo/shell/package_manager",
+    "//mojo/shell/public/cpp",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/gl",
@@ -172,7 +172,7 @@ source_set("lib") {
       ":jni_headers",
       ":run_android_application_function",
       "//components/mus/gles2",
-      "//mojo/application/public/cpp:content_handler",
+      "//mojo/shell/public/cpp:content_handler",
     ]
   } else {
     sources += [
diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc
index 463d505..55522d4 100644
--- a/mojo/runner/android/android_handler.cc
+++ b/mojo/runner/android/android_handler.cc
@@ -14,11 +14,11 @@
 #include "base/logging.h"
 #include "base/scoped_native_library.h"
 #include "jni/AndroidHandler_jni.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/runner/android/run_android_application_function.h"
 #include "mojo/runner/host/native_application_support.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
diff --git a/mojo/runner/android/android_handler.h b/mojo/runner/android/android_handler.h
index c81d2a8..43a535f 100644
--- a/mojo/runner/android/android_handler.h
+++ b/mojo/runner/android/android_handler.h
@@ -7,10 +7,10 @@
 
 #include <jni.h>
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/content_handler_factory.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/content_handler_factory.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace base {
 class FilePath;
diff --git a/mojo/runner/android/android_handler_loader.h b/mojo/runner/android/android_handler_loader.h
index 24ada8d..8c8e4e4 100644
--- a/mojo/runner/android/android_handler_loader.h
+++ b/mojo/runner/android/android_handler_loader.h
@@ -8,9 +8,9 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/runner/android/android_handler.h"
 #include "mojo/shell/application_loader.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/android/background_application_loader_unittest.cc b/mojo/runner/android/background_application_loader_unittest.cc
index f99e44c..7201a63 100644
--- a/mojo/runner/android/background_application_loader_unittest.cc
+++ b/mojo/runner/android/background_application_loader_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/runner/android/background_application_loader.h"
 
-#include "mojo/application/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/runner/child/BUILD.gn b/mojo/runner/child/BUILD.gn
index 7ba5fb7..7a40f6c 100644
--- a/mojo/runner/child/BUILD.gn
+++ b/mojo/runner/child/BUILD.gn
@@ -22,9 +22,9 @@ source_set("lib") {
   deps = [
     ":interfaces",
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/message_pump",
     "//mojo/platform_handle:platform_handle_impl",
+    "//mojo/shell/public/interfaces",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -35,7 +35,7 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
@@ -53,10 +53,10 @@ source_set("test_native_main") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/gles2",
     "//mojo/message_pump",
     "//mojo/runner/child:lib",
+    "//mojo/shell/public/cpp",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -67,7 +67,7 @@ mojom("apptest_interfaces") {
   ]
 
   deps = [
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
@@ -86,10 +86,10 @@ mojo_native_application("apptests") {
     ":apptest_interfaces",
     "//base",
     "//base/test:test_config",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common:common_base",
     "//mojo/converters/network:network",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
   ]
 
   data_deps = [
@@ -110,7 +110,7 @@ executable("native_target") {
     ":lib",
     ":test_native_main",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/runner/child/child_controller.mojom b/mojo/runner/child/child_controller.mojom
index ece1e67..741723e 100644
--- a/mojo/runner/child/child_controller.mojom
+++ b/mojo/runner/child/child_controller.mojom
@@ -4,7 +4,7 @@
 
 module mojo.runner;
 
-import "mojo/application/public/interfaces/application.mojom";
+import "mojo/shell/public/interfaces/application.mojom";
 
 interface ChildController {
   // Starts the app.
diff --git a/mojo/runner/child/native_apptest.cc b/mojo/runner/child/native_apptest.cc
index cc47edb..15c2564 100644
--- a/mojo/runner/child/native_apptest.cc
+++ b/mojo/runner/child/native_apptest.cc
@@ -4,10 +4,10 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/runner/child/test_native_service.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/child/native_apptest_target.cc b/mojo/runner/child/native_apptest_target.cc
index 052040f..9b3cae6 100644
--- a/mojo/runner/child/native_apptest_target.cc
+++ b/mojo/runner/child/native_apptest_target.cc
@@ -7,14 +7,14 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.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.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/runner/child/test_native_main.h"
 #include "mojo/runner/child/test_native_service.mojom.h"
 #include "mojo/runner/init.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace {
 
diff --git a/mojo/runner/child/runner_connection.h b/mojo/runner/child/runner_connection.h
index 68202e1..83423dd 100644
--- a/mojo/runner/child/runner_connection.h
+++ b/mojo/runner/child/runner_connection.h
@@ -6,7 +6,7 @@
 #define MOJO_RUNNER_CHILD_RUNNER_CONNECTION_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace runner {
diff --git a/mojo/runner/child/test_native_main.cc b/mojo/runner/child/test_native_main.cc
index 19ea8df..85248b6 100644
--- a/mojo/runner/child/test_native_main.cc
+++ b/mojo/runner/child/test_native_main.cc
@@ -12,11 +12,11 @@
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/runner/child/runner_connection.h"
 #include "mojo/runner/init.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 3709b88..657d99a 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -28,9 +28,6 @@
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/tracing/tracing_switches.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/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/host/in_process_native_runner.h"
 #include "mojo/runner/host/out_of_process_native_runner.h"
@@ -44,6 +41,9 @@
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc
index 69e8a19..b1c57da 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/runner/shell_apptest.cc
@@ -12,8 +12,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/runner/kPingable.h"
@@ -22,6 +20,8 @@
 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 namespace mojo {
 namespace {
diff --git a/mojo/runner/test/BUILD.gn b/mojo/runner/test/BUILD.gn
index bd94a9d..7d9dc14 100644
--- a/mojo/runner/test/BUILD.gn
+++ b/mojo/runner/test/BUILD.gn
@@ -22,7 +22,7 @@ mojo_native_application("pingable_app") {
 
   deps = [
     ":bindings",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings:callback",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/runner/test/pingable_app.cc b/mojo/runner/test/pingable_app.cc
index 2930a51..e53a11c 100644
--- a/mojo/runner/test/pingable_app.cc
+++ b/mojo/runner/test/pingable_app.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#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/interface_factory.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/test/pingable.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index 286760d..e5c3ef2 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -93,7 +93,6 @@ source_set("lib") {
   deps = [
     "//base",
     "//components/filesystem/public/interfaces",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/common:url_type_converters",
     "//mojo/message_pump",
@@ -101,6 +100,7 @@ source_set("lib") {
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
+    "//mojo/shell/public/cpp",
     "//net",
     "//net:extras",
     "//net:http_server",
@@ -119,11 +119,11 @@ source_set("sources") {
   deps = [
     ":lib",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -141,13 +141,13 @@ mojo_native_application("apptests") {
     ":lib",
     ":network",
     "//base",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
     "//mojo/common:common_base",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/network/public/cpp",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
     "//net",
     "//net:test_support",
     "//testing/gtest",
diff --git a/mojo/services/network/DEPS b/mojo/services/network/DEPS
index fa4edaa..d7b3016 100644
--- a/mojo/services/network/DEPS
+++ b/mojo/services/network/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+base",
   "+components/filesystem/public/interfaces",
-  "+mojo/application",
+  "+mojo/shell",
   "+mojo/common",
   "+mojo/message_pump",
   "+mojo/services",
diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h
index e3466f9..0fe7d2e 100644
--- a/mojo/services/network/cookie_store_impl.h
+++ b/mojo/services/network/cookie_store_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_COOKIE_STORE_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 22e87e2..f630f76 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -15,9 +15,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
@@ -29,6 +26,9 @@
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
diff --git a/mojo/services/network/http_server_impl.h b/mojo/services/network/http_server_impl.h
index 72a2d79..d4fb67c 100644
--- a/mojo/services/network/http_server_impl.h
+++ b/mojo/services/network/http_server_impl.h
@@ -10,9 +10,9 @@
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/services/network/public/interfaces/http_server.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/server/http_server.h"
 
 namespace net {
diff --git a/mojo/services/network/main.cc b/mojo/services/network/main.cc
index 45216b1..3ae88bc 100644
--- a/mojo/services/network/main.cc
+++ b/mojo/services/network/main.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/network/network_service_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new mojo::NetworkServiceDelegate);
diff --git a/mojo/services/network/network_service_delegate.cc b/mojo/services/network/network_service_delegate.cc
index f228bef..fff5950 100644
--- a/mojo/services/network/network_service_delegate.cc
+++ b/mojo/services/network/network_service_delegate.cc
@@ -14,13 +14,13 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/cookie_store_impl.h"
 #include "mojo/services/network/network_service_delegate_observer.h"
 #include "mojo/services/network/network_service_impl.h"
 #include "mojo/services/network/url_loader_factory_impl.h"
 #include "mojo/services/network/web_socket_factory_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 
diff --git a/mojo/services/network/network_service_delegate.h b/mojo/services/network/network_service_delegate.h
index 16b2f96..948795f 100644
--- a/mojo/services/network/network_service_delegate.h
+++ b/mojo/services/network/network_service_delegate.h
@@ -8,15 +8,15 @@
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace sql {
 class ScopedMojoFilesystemVFS;
diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h
index fd6455c..1b3531e 100644
--- a/mojo/services/network/network_service_impl.h
+++ b/mojo/services/network/network_service_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_NETWORK_SERVICE_IMPL_H_
 
 #include "base/compiler_specific.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/services/network/public/cpp/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn
index 80262fc..6bb891b 100644
--- a/mojo/services/network/public/cpp/BUILD.gn
+++ b/mojo/services/network/public/cpp/BUILD.gn
@@ -16,10 +16,10 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/environment:chromium",
     "//mojo/message_pump",
     "//mojo/public/c/system",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h
index 17d4a001..268f436 100644
--- a/mojo/services/network/tcp_bound_socket_impl.h
+++ b/mojo/services/network/tcp_bound_socket_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_TCP_BOUND_SOCKET_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/socket/tcp_socket.h"
 
 namespace mojo {
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index 15d72f3..62b9a14 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -7,10 +7,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/socket/tcp_socket.h"
 
 namespace mojo {
diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h
index 84ce309..184f96d 100644
--- a/mojo/services/network/tcp_server_socket_impl.h
+++ b/mojo/services/network/tcp_server_socket_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_NETWORK_TCP_SERVER_SOCKET_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/ip_endpoint.h"
 #include "net/socket/tcp_socket.h"
 
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index b7e98d4..17388a4 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -10,13 +10,13 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/network/public/cpp/udp_socket_wrapper.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h
index c238c21..edc2a66 100644
--- a/mojo/services/network/udp_socket_impl.h
+++ b/mojo/services/network/udp_socket_impl.h
@@ -12,9 +12,9 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_socket.h"
 
diff --git a/mojo/services/network/url_loader_factory_impl.h b/mojo/services/network/url_loader_factory_impl.h
index 7a67cee..a290cd4 100644
--- a/mojo/services/network/url_loader_factory_impl.h
+++ b/mojo/services/network/url_loader_factory_impl.h
@@ -7,9 +7,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace mojo {
 class NetworkContext;
diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h
index c972f60..86ba68c 100644
--- a/mojo/services/network/url_loader_impl.h
+++ b/mojo/services/network/url_loader_impl.h
@@ -9,10 +9,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
diff --git a/mojo/services/network/url_loader_impl_apptest.cc b/mojo/services/network/url_loader_impl_apptest.cc
index d3d68c6..90e7c96 100644
--- a/mojo/services/network/url_loader_impl_apptest.cc
+++ b/mojo/services/network/url_loader_impl_apptest.cc
@@ -9,11 +9,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/url_loader_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
diff --git a/mojo/services/network/web_socket_factory_impl.h b/mojo/services/network/web_socket_factory_impl.h
index 97d60c5..f820373 100644
--- a/mojo/services/network/web_socket_factory_impl.h
+++ b/mojo/services/network/web_socket_factory_impl.h
@@ -7,9 +7,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace mojo {
 class NetworkContext;
diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h
index 881b165..26a2036 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -8,9 +8,9 @@
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 namespace net {
 class WebSocketChannel;
diff --git a/mojo/services/test_service/BUILD.gn b/mojo/services/test_service/BUILD.gn
index 36647da..d35ae11 100644
--- a/mojo/services/test_service/BUILD.gn
+++ b/mojo/services/test_service/BUILD.gn
@@ -38,7 +38,7 @@ mojo_native_application("test_app") {
     ":bindings",
     "//base",
     "//base:i18n",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -58,6 +58,6 @@ mojo_native_application("test_request_tracker_app") {
     ":bindings",
     "//base",
     "//base:i18n",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/test_service/DEPS b/mojo/services/test_service/DEPS
index e402e7f..2590b53 100644
--- a/mojo/services/test_service/DEPS
+++ b/mojo/services/test_service/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application/public/cpp",
+  "+mojo/shell/public/cpp",
 ]
diff --git a/mojo/services/test_service/test_request_tracker_application.cc b/mojo/services/test_service/test_request_tracker_application.cc
index 5168cfa..d2cdbc9 100644
--- a/mojo/services/test_service/test_request_tracker_application.cc
+++ b/mojo/services/test_service/test_request_tracker_application.cc
@@ -7,10 +7,10 @@
 #include <assert.h>
 #include <utility>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_request_tracker_application.h b/mojo/services/test_service/test_request_tracker_application.h
index a009f62..ac07075 100644
--- a/mojo/services/test_service/test_request_tracker_application.h
+++ b/mojo/services/test_service/test_request_tracker_application.h
@@ -5,10 +5,10 @@
 #ifndef SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_
 #define SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/test_service/test_request_tracker_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace mojo {
 class ApplicationImpl;
diff --git a/mojo/services/test_service/test_service_application.cc b/mojo/services/test_service/test_service_application.cc
index 1f1cfe6..a39cb2d 100644
--- a/mojo/services/test_service/test_service_application.cc
+++ b/mojo/services/test_service/test_service_application.cc
@@ -7,11 +7,11 @@
 #include <assert.h>
 #include <utility>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/test_service/test_service_impl.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_service_application.h b/mojo/services/test_service/test_service_application.h
index 4ad5559..42b476c 100644
--- a/mojo/services/test_service/test_service_application.h
+++ b/mojo/services/test_service/test_service_application.h
@@ -5,9 +5,9 @@
 #ifndef SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_
 #define SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 class ApplicationConnection;
diff --git a/mojo/services/test_service/test_service_impl.cc b/mojo/services/test_service/test_service_impl.cc
index 998c99c..3429e0c0 100644
--- a/mojo/services/test_service/test_service_impl.cc
+++ b/mojo/services/test_service/test_service_impl.cc
@@ -11,10 +11,10 @@
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/test_service/test_service_application.h"
 #include "mojo/services/test_service/test_time_service_impl.h"
 #include "mojo/services/test_service/tracked_service.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/test_service/test_time_service_impl.cc b/mojo/services/test_service/test_time_service_impl.cc
index f7a6d13..485be00 100644
--- a/mojo/services/test_service/test_time_service_impl.cc
+++ b/mojo/services/test_service/test_time_service_impl.cc
@@ -9,9 +9,9 @@
 #include <utility>
 
 #include "base/time/time.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/test_service/test_request_tracker.mojom.h"
 #include "mojo/services/test_service/tracked_service.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn
index 4c8421e..14fed0f 100644
--- a/mojo/services/tracing/BUILD.gn
+++ b/mojo/services/tracing/BUILD.gn
@@ -13,8 +13,8 @@ mojo_native_application("tracing") {
 
   deps = [
     ":lib",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp",
   ]
 }
 
@@ -30,8 +30,8 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/tracing/DEPS b/mojo/services/tracing/DEPS
index bfc9a9e..72513eb 100644
--- a/mojo/services/tracing/DEPS
+++ b/mojo/services/tracing/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/application",
+  "+mojo/shell",
 ]
diff --git a/mojo/services/tracing/main.cc b/mojo/services/tracing/main.cc
index 1810d1b..c338c97 100644
--- a/mojo/services/tracing/main.cc
+++ b/mojo/services/tracing/main.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/tracing_app.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(new tracing::TracingApp);
diff --git a/mojo/services/tracing/public/cpp/BUILD.gn b/mojo/services/tracing/public/cpp/BUILD.gn
index 02eed11..38b3cfe 100644
--- a/mojo/services/tracing/public/cpp/BUILD.gn
+++ b/mojo/services/tracing/public/cpp/BUILD.gn
@@ -14,8 +14,8 @@ source_set("cpp") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/interfaces",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/services/tracing/public/cpp/trace_provider_impl.cc b/mojo/services/tracing/public/cpp/trace_provider_impl.cc
index e9190f5..d37149e 100644
--- a/mojo/services/tracing/public/cpp/trace_provider_impl.cc
+++ b/mojo/services/tracing/public/cpp/trace_provider_impl.cc
@@ -12,8 +12,8 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/services/tracing/public/cpp/tracing_impl.cc b/mojo/services/tracing/public/cpp/tracing_impl.cc
index 4b0872d..b0fd154 100644
--- a/mojo/services/tracing/public/cpp/tracing_impl.cc
+++ b/mojo/services/tracing/public/cpp/tracing_impl.cc
@@ -10,7 +10,7 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event_impl.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 #ifdef NDEBUG
 #include "base/command_line.h"
diff --git a/mojo/services/tracing/public/cpp/tracing_impl.h b/mojo/services/tracing/public/cpp/tracing_impl.h
index b832ef49..97944e8 100644
--- a/mojo/services/tracing/public/cpp/tracing_impl.h
+++ b/mojo/services/tracing/public/cpp/tracing_impl.h
@@ -6,9 +6,9 @@
 #define MOJO_SERVICES_TRACING_PUBLIC_CPP_TRACING_IMPL_H_
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
diff --git a/mojo/services/tracing/tracing_app.cc b/mojo/services/tracing/tracing_app.cc
index e559470..01e8dd5 100644
--- a/mojo/services/tracing/tracing_app.cc
+++ b/mojo/services/tracing/tracing_app.cc
@@ -12,7 +12,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 
 namespace tracing {
 
diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h
index a1e0749..926c096 100644
--- a/mojo/services/tracing/tracing_app.h
+++ b/mojo/services/tracing/tracing_app.h
@@ -10,14 +10,14 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.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/common/weak_interface_ptr_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "mojo/services/tracing/trace_data_sink.h"
 #include "mojo/services/tracing/trace_recorder_impl.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace tracing {
 
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 202d4dd..dee5ebb 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -42,18 +42,18 @@ source_set("shell") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/updater",
+    "//mojo/shell/public/interfaces",
     "//url",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//crypto:crypto",
-    "//mojo/application/public/cpp:sources",
     "//mojo/environment:chromium",
+    "//mojo/shell/public/cpp:sources",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//url",
@@ -72,8 +72,8 @@ source_set("test_support") {
   deps = [
     ":shell",
     ":test_bindings",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//testing/gtest",
   ]
 }
@@ -95,11 +95,11 @@ test("mojo_shell_unittests") {
     ":test_bindings",
     ":test_support",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/edk/system:test_utils",
     "//mojo/public/cpp/system",
     "//mojo/shell/fetcher",
     "//mojo/shell/package_manager",
+    "//mojo/shell/public/cpp",
     "//mojo/util:filename_util",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
@@ -127,11 +127,11 @@ mojo_native_application("apptests") {
     ":test_bindings",
     "//base",
     "//base/test:test_config",
-    "//mojo/application/public/cpp:sources",
-    "//mojo/application/public/cpp:test_support",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/network",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/cpp:test_support",
+    "//mojo/shell/public/interfaces",
   ]
 
   data_deps = [
@@ -151,12 +151,12 @@ executable("application_manager_apptest_driver") {
     ":test_bindings",
     "//base",
     "//base:base_static",
-    "//mojo/application/public/cpp",
-    "//mojo/application/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/runner:init",
     "//mojo/runner/child:test_native_main",
+    "//mojo/shell/public/cpp",
+    "//mojo/shell/public/interfaces",
     "//third_party/mojo/src/mojo/edk/system",
   ]
 }
@@ -171,9 +171,9 @@ executable("application_manager_apptest_target") {
   deps = [
     ":test_bindings",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/runner/child:test_native_main",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc
index 4043529..0d709af 100644
--- a/mojo/shell/application_instance.cc
+++ b/mojo/shell/application_instance.cc
@@ -11,10 +11,10 @@
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/application_instance.h b/mojo/shell/application_instance.h
index a7795eb..ddfaf4c 100644
--- a/mojo/shell/application_instance.h
+++ b/mojo/shell/application_instance.h
@@ -13,13 +13,13 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/application_loader.h b/mojo/shell/application_loader.h
index f464ab1..add330c 100644
--- a/mojo/shell/application_loader.h
+++ b/mojo/shell/application_loader.h
@@ -6,9 +6,9 @@
 #define SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_
 
 #include "base/callback.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index ebe825e..2000bc4 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -12,10 +12,6 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/weak_interface_ptr_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
@@ -25,6 +21,10 @@
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace base {
diff --git a/mojo/shell/application_manager_apptest.cc b/mojo/shell/application_manager_apptest.cc
index ca9c9e4..fa9a8f6 100644
--- a/mojo/shell/application_manager_apptest.cc
+++ b/mojo/shell/application_manager_apptest.cc
@@ -11,12 +11,12 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTest;
 
diff --git a/mojo/shell/application_manager_apptest_driver.cc b/mojo/shell/application_manager_apptest_driver.cc
index e92aa7d..9de6d41 100644
--- a/mojo/shell/application_manager_apptest_driver.cc
+++ b/mojo/shell/application_manager_apptest_driver.cc
@@ -18,11 +18,6 @@
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/thread_task_runner_handle.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.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/edk/embedder/embedder.h"
@@ -30,6 +25,11 @@
 #include "mojo/runner/child/test_native_main.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
diff --git a/mojo/shell/application_manager_apptest_target.cc b/mojo/shell/application_manager_apptest_target.cc
index e57721b..62534fd 100644
--- a/mojo/shell/application_manager_apptest_target.cc
+++ b/mojo/shell/application_manager_apptest_target.cc
@@ -5,12 +5,12 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.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/runner/child/test_native_main.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr;
 
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 6da5557..d63972c 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -12,16 +12,16 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.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.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test.mojom.h"
 #include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/shell/capability_filter_test.cc b/mojo/shell/capability_filter_test.cc
index 8fc0c118..7f384be 100644
--- a/mojo/shell/capability_filter_test.cc
+++ b/mojo/shell/capability_filter_test.cc
@@ -9,15 +9,15 @@
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/package_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/capability_filter_test.h b/mojo/shell/capability_filter_test.h
index 291ec1b..7ead2a97 100644
--- a/mojo/shell/capability_filter_test.h
+++ b/mojo/shell/capability_filter_test.h
@@ -6,10 +6,10 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/capability_filter_unittest.mojom.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/shell/connect_to_application_params.h b/mojo/shell/connect_to_application_params.h
index 0fce753..c911552 100644
--- a/mojo/shell/connect_to_application_params.h
+++ b/mojo/shell/connect_to_application_params.h
@@ -10,11 +10,11 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/fetcher/BUILD.gn b/mojo/shell/fetcher/BUILD.gn
index e634cc8..48cfe0f5 100644
--- a/mojo/shell/fetcher/BUILD.gn
+++ b/mojo/shell/fetcher/BUILD.gn
@@ -22,19 +22,19 @@ source_set("fetcher") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/updater",
+    "//mojo/shell/public/interfaces",
     "//url",
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
     "//crypto:crypto",
-    "//mojo/application/public/cpp:sources",
     "//mojo/environment:chromium",
     "//mojo/shell",
+    "//mojo/shell/public/cpp:sources",
     "//mojo/util:filename_util",
     "//net",
     "//third_party/mojo/src/mojo/edk/system",
diff --git a/mojo/shell/fetcher/about_fetcher_unittest.cc b/mojo/shell/fetcher/about_fetcher_unittest.cc
index 907462c..93c27c4 100644
--- a/mojo/shell/fetcher/about_fetcher_unittest.cc
+++ b/mojo/shell/fetcher/about_fetcher_unittest.cc
@@ -14,15 +14,15 @@
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.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.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h
index 00ccfd9..68b8279 100644
--- a/mojo/shell/native_runner.h
+++ b/mojo/shell/native_runner.h
@@ -8,8 +8,8 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 #if defined(OS_WIN)
 #undef DELETE
diff --git a/mojo/shell/package_manager.h b/mojo/shell/package_manager.h
index f0c8839..147c25d 100644
--- a/mojo/shell/package_manager.h
+++ b/mojo/shell/package_manager.h
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/fetcher.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 class GURL;
 
diff --git a/mojo/shell/package_manager/BUILD.gn b/mojo/shell/package_manager/BUILD.gn
index 7a11e75..3d6b72c 100644
--- a/mojo/shell/package_manager/BUILD.gn
+++ b/mojo/shell/package_manager/BUILD.gn
@@ -30,9 +30,9 @@ test("unittests") {
   deps = [
     ":package_manager",
     "//base",
-    "//mojo/application/public/cpp",
     "//mojo/shell",
     "//mojo/shell:test_support",
+    "//mojo/shell/public/cpp",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//url",
diff --git a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
index 57298ec..3ab4b9d 100644
--- a/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
+++ b/mojo/shell/package_manager/capability_filter_content_handler_unittest.cc
@@ -8,15 +8,15 @@
 
 #include "base/macros.h"
 #include "base/path_service.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.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/capability_filter_test.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/shell/package_manager/content_handler_connection.h b/mojo/shell/package_manager/content_handler_connection.h
index 92b5929..3b94d78 100644
--- a/mojo/shell/package_manager/content_handler_connection.h
+++ b/mojo/shell/package_manager/content_handler_connection.h
@@ -11,8 +11,8 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/identity.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/package_manager/content_handler_unittest.cc b/mojo/shell/package_manager/content_handler_unittest.cc
index fce2d31..89d7c83 100644
--- a/mojo/shell/package_manager/content_handler_unittest.cc
+++ b/mojo/shell/package_manager/content_handler_unittest.cc
@@ -13,18 +13,18 @@
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.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.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/shell/package_manager/package_manager_impl.cc b/mojo/shell/package_manager/package_manager_impl.cc
index 9b95c3e..93bbe85 100644
--- a/mojo/shell/package_manager/package_manager_impl.cc
+++ b/mojo/shell/package_manager/package_manager_impl.cc
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher/about_fetcher.h"
@@ -18,6 +17,7 @@
 #include "mojo/shell/fetcher/network_fetcher.h"
 #include "mojo/shell/fetcher/switches.h"
 #include "mojo/shell/package_manager/content_handler_connection.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/shell/public/cpp/BUILD.gn
index 990aae3..55cd782 100644
--- a/mojo/application/public/cpp/BUILD.gn
+++ b/mojo/shell/public/cpp/BUILD.gn
@@ -53,9 +53,9 @@ source_set("sources") {
 
   public_deps = [
     "//base",
-    "//mojo/application/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/interfaces",
   ]
 }
 
@@ -75,9 +75,9 @@ source_set("content_handler") {
 
     # TODO: this code should not depend on base.
     "//base",
-    "//mojo/application/public/interfaces:interfaces_cpp_sources",
     "//mojo/message_pump",
     "//mojo/services/network/public/interfaces",
+    "//mojo/shell/public/interfaces:interfaces_cpp_sources",
   ]
 }
 
@@ -97,11 +97,11 @@ source_set("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//mojo/application/public/interfaces:interfaces_cpp_sources",
     "//mojo/logging",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/interfaces:interfaces_cpp_sources",
   ]
 
   data_deps = []
diff --git a/mojo/application/public/cpp/app_lifetime_helper.h b/mojo/shell/public/cpp/app_lifetime_helper.h
index be9f886..ae2503f 100644
--- a/mojo/application/public/cpp/app_lifetime_helper.h
+++ b/mojo/shell/public/cpp/app_lifetime_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#define MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -78,4 +78,4 @@ class AppLifetimeHelper {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APP_LIFETIME_HELPER_H_
diff --git a/mojo/application/public/cpp/application_connection.h b/mojo/shell/public/cpp/application_connection.h
index b194f72..64d613d 100644
--- a/mojo/application/public/cpp/application_connection.h
+++ b/mojo/shell/public/cpp/application_connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
 
 #include <stdint.h>
 
@@ -11,8 +11,8 @@
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/lib/interface_factory_connector.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/lib/interface_factory_connector.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -141,4 +141,4 @@ class ApplicationConnection {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_CONNECTION_H_
diff --git a/mojo/application/public/cpp/application_delegate.h b/mojo/shell/public/cpp/application_delegate.h
index a378490..219091f 100644
--- a/mojo/application/public/cpp/application_delegate.h
+++ b/mojo/shell/public/cpp/application_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class ApplicationDelegate {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_DELEGATE_H_
diff --git a/mojo/application/public/cpp/application_impl.h b/mojo/shell/public/cpp/application_impl.h
index 3081990..3853bab 100644
--- a/mojo/application/public/cpp/application_impl.h
+++ b/mojo/shell/public/cpp/application_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <utility>
 #include <vector>
@@ -11,15 +11,15 @@
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/lib/service_registry.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
@@ -183,4 +183,4 @@ class ApplicationImpl : public Application {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
diff --git a/mojo/application/public/cpp/application_runner.h b/mojo/shell/public/cpp/application_runner.h
index 09835cb..10eb0a7 100644
--- a/mojo/application/public/cpp/application_runner.h
+++ b/mojo/shell/public/cpp/application_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ -60,4 +60,4 @@ class ApplicationRunner {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
diff --git a/mojo/application/public/cpp/application_test_base.h b/mojo/shell/public/cpp/application_test_base.h
index 5b0fab1..55b9ea9 100644
--- a/mojo/application/public/cpp/application_test_base.h
+++ b/mojo/shell/public/cpp/application_test_base.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#define MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/macros.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ -56,4 +56,4 @@ class ApplicationTestBase : public testing::Test {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
diff --git a/mojo/application/public/cpp/connect.h b/mojo/shell/public/cpp/connect.h
index 214e220..acc496c 100644
--- a/mojo/application/public/cpp/connect.h
+++ b/mojo/shell/public/cpp/connect.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
+#define MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
 
 #include <utility>
 
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -22,4 +22,4 @@ inline void ConnectToService(ServiceProvider* service_provider,
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_CONNECT_H_
diff --git a/mojo/application/public/cpp/content_handler_factory.h b/mojo/shell/public/cpp/content_handler_factory.h
index f27c175..4bcb81e 100644
--- a/mojo/application/public/cpp/content_handler_factory.h
+++ b/mojo/shell/public/cpp/content_handler_factory.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#define MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/content_handler.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
@@ -78,4 +78,4 @@ make_handled_factory_holder(A* value) {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_CONTENT_HANDLER_FACTORY_H_
diff --git a/mojo/application/public/cpp/initialize_base_and_icu.cc b/mojo/shell/public/cpp/initialize_base_and_icu.cc
index 2ec37df..2ec37df 100644
--- a/mojo/application/public/cpp/initialize_base_and_icu.cc
+++ b/mojo/shell/public/cpp/initialize_base_and_icu.cc
diff --git a/mojo/application/public/cpp/interface_factory.h b/mojo/shell/public/cpp/interface_factory.h
index c7dd839..7f8f26e 100644
--- a/mojo/application/public/cpp/interface_factory.h
+++ b/mojo/shell/public/cpp/interface_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#define MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
 
 #include "mojo/public/cpp/bindings/interface_request.h"
 
@@ -27,4 +27,4 @@ class InterfaceFactory {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
diff --git a/mojo/application/public/cpp/interface_factory_impl.h b/mojo/shell/public/cpp/interface_factory_impl.h
index d4cf1c2..7de2449 100644
--- a/mojo/application/public/cpp/interface_factory_impl.h
+++ b/mojo/shell/public/cpp/interface_factory_impl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
 
-#include "mojo/application/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
 
 namespace mojo {
 
@@ -46,4 +46,4 @@ class InterfaceFactoryImplWithContext : public InterfaceFactory<Interface> {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
diff --git a/mojo/application/public/cpp/lazy_interface_ptr.h b/mojo/shell/public/cpp/lazy_interface_ptr.h
index 30f406e..0497dc2 100644
--- a/mojo/application/public/cpp/lazy_interface_ptr.h
+++ b/mojo/shell/public/cpp/lazy_interface_ptr.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#define MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
 
-#include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -43,4 +43,4 @@ class LazyInterfacePtr : public InterfacePtr<Interface> {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_
diff --git a/mojo/application/public/cpp/lib/app_lifetime_helper.cc b/mojo/shell/public/cpp/lib/app_lifetime_helper.cc
index 74c7ee8..0772412a 100644
--- a/mojo/application/public/cpp/lib/app_lifetime_helper.cc
+++ b/mojo/shell/public/cpp/lib/app_lifetime_helper.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/app_lifetime_helper.h"
+#include "mojo/shell/public/cpp/app_lifetime_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_delegate.cc b/mojo/shell/public/cpp/lib/application_delegate.cc
index fd7c356..41ba51c 100644
--- a/mojo/application/public/cpp/lib/application_delegate.cc
+++ b/mojo/shell/public/cpp/lib/application_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_impl.cc b/mojo/shell/public/cpp/lib/application_impl.cc
index b1f6224..e48483f 100644
--- a/mojo/application/public/cpp/lib/application_impl.cc
+++ b/mojo/shell/public/cpp/lib/application_impl.cc
@@ -7,12 +7,12 @@
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/lib/service_registry.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_runner.cc b/mojo/shell/public/cpp/lib/application_runner.cc
index d3ac30c..02380c6 100644
--- a/mojo/application/public/cpp/lib/application_runner.cc
+++ b/mojo/shell/public/cpp/lib/application_runner.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_runner.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/application_test_base.cc b/mojo/shell/public/cpp/lib/application_test_base.cc
index bd8df6d..d1b2cfa 100644
--- a/mojo/application/public/cpp/lib/application_test_base.cc
+++ b/mojo/shell/public/cpp/lib/application_test_base.cc
@@ -6,12 +6,12 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/application/public/cpp/application_test_base.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/application/public/cpp/lib/application_test_main.cc b/mojo/shell/public/cpp/lib/application_test_main.cc
index 146e915..470846c 100644
--- a/mojo/application/public/cpp/lib/application_test_main.cc
+++ b/mojo/shell/public/cpp/lib/application_test_main.cc
@@ -5,10 +5,10 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/public/c/system/main.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/application_test_base.h"
 
 MojoResult MojoMain(MojoHandle handle) {
   // An AtExitManager instance is needed to construct message loops.
diff --git a/mojo/application/public/cpp/lib/content_handler_factory.cc b/mojo/shell/public/cpp/lib/content_handler_factory.cc
index d4cb54c..c810354 100644
--- a/mojo/application/public/cpp/lib/content_handler_factory.cc
+++ b/mojo/shell/public/cpp/lib/content_handler_factory.cc
@@ -12,14 +12,14 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.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/content_handler_factory.h"
-#include "mojo/application/public/cpp/interface_factory_impl.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/cpp/content_handler_factory.h"
+#include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/init_commandline.cc b/mojo/shell/public/cpp/lib/init_commandline.cc
index a61797b..a61797b 100644
--- a/mojo/application/public/cpp/lib/init_commandline.cc
+++ b/mojo/shell/public/cpp/lib/init_commandline.cc
diff --git a/mojo/application/public/cpp/lib/interface_factory_connector.h b/mojo/shell/public/cpp/lib/interface_factory_connector.h
index cd99dff..5ef7eaa 100644
--- a/mojo/application/public/cpp/lib/interface_factory_connector.h
+++ b/mojo/shell/public/cpp/lib/interface_factory_connector.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
 
 #include <utility>
 
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/cpp/service_connector.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
@@ -36,4 +36,4 @@ class InterfaceFactoryConnector : public ServiceConnector {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_
diff --git a/mojo/application/public/cpp/lib/service_connector_registry.cc b/mojo/shell/public/cpp/lib/service_connector_registry.cc
index 58f9fc7..edc91e0 100644
--- a/mojo/application/public/cpp/lib/service_connector_registry.cc
+++ b/mojo/shell/public/cpp/lib/service_connector_registry.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
 
 #include <utility>
 
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/application/public/cpp/lib/service_connector_registry.h b/mojo/shell/public/cpp/lib/service_connector_registry.h
index b196353..9475436 100644
--- a/mojo/application/public/cpp/lib/service_connector_registry.h
+++ b/mojo/shell/public/cpp/lib/service_connector_registry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
 
 #include <map>
 #include <string>
@@ -59,4 +59,4 @@ class ServiceConnectorRegistry {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_
diff --git a/mojo/application/public/cpp/lib/service_provider_impl.cc b/mojo/shell/public/cpp/lib/service_provider_impl.cc
index 03e57ef..4a411a2 100644
--- a/mojo/application/public/cpp/lib/service_provider_impl.cc
+++ b/mojo/shell/public/cpp/lib/service_provider_impl.cc
@@ -4,9 +4,9 @@
 
 #include <utility>
 
-#include "mojo/application/public/cpp/service_connector.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/public/cpp/environment/logging.h"
+#include "mojo/shell/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 namespace mojo {
 
diff --git a/mojo/application/public/cpp/lib/service_registry.cc b/mojo/shell/public/cpp/lib/service_registry.cc
index 808cef2..09f71de 100644
--- a/mojo/application/public/cpp/lib/service_registry.cc
+++ b/mojo/shell/public/cpp/lib/service_registry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 #include <stdint.h>
 
@@ -10,8 +10,8 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 
 namespace mojo {
 namespace internal {
diff --git a/mojo/application/public/cpp/lib/service_registry.h b/mojo/shell/public/cpp/lib/service_registry.h
index b0339dd..1c2abc9 100644
--- a/mojo/application/public/cpp/lib/service_registry.h
+++ b/mojo/shell/public/cpp/lib/service_registry.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <string>
 
-#include "mojo/application/public/cpp/application_connection.h"
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 namespace internal {
@@ -80,4 +80,4 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
diff --git a/mojo/application/public/cpp/service_connector.h b/mojo/shell/public/cpp/service_connector.h
index 3a7d656..8856e3f 100644
--- a/mojo/application/public/cpp/service_connector.h
+++ b/mojo/shell/public/cpp/service_connector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#define MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@ class ServiceConnector {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_SERVICE_CONNECTOR_H_
diff --git a/mojo/application/public/cpp/service_provider_impl.h b/mojo/shell/public/cpp/service_provider_impl.h
index 0a9fb77..2d5ed75 100644
--- a/mojo/application/public/cpp/service_provider_impl.h
+++ b/mojo/shell/public/cpp/service_provider_impl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
-#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#ifndef MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#define MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
 
 #include <string>
 
-#include "mojo/application/public/cpp/lib/interface_factory_connector.h"
-#include "mojo/application/public/cpp/lib/service_connector_registry.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/public/cpp/lib/interface_factory_connector.h"
+#include "mojo/shell/public/cpp/lib/service_connector_registry.h"
+#include "mojo/shell/public/interfaces/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -47,4 +47,4 @@ class ServiceProviderImpl : public ServiceProvider {
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#endif  // MOJO_SHELL_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
diff --git a/mojo/application/public/cpp/tests/BUILD.gn b/mojo/shell/public/cpp/tests/BUILD.gn
index 29b35d8..51da838 100644
--- a/mojo/application/public/cpp/tests/BUILD.gn
+++ b/mojo/shell/public/cpp/tests/BUILD.gn
@@ -11,7 +11,7 @@ test("mojo_public_application_unittests") {
 
   deps = [
     "//base",
-    "//mojo/application/public/cpp",
+    "//mojo/shell/public/cpp",
     "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
   ]
diff --git a/mojo/application/public/cpp/tests/service_registry_unittest.cc b/mojo/shell/public/cpp/tests/service_registry_unittest.cc
index 98ce637..349e9aa 100644
--- a/mojo/application/public/cpp/tests/service_registry_unittest.cc
+++ b/mojo/shell/public/cpp/tests/service_registry_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/cpp/lib/service_registry.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/public/cpp/service_connector.h"
+#include "mojo/shell/public/cpp/service_connector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/application/public/interfaces/BUILD.gn b/mojo/shell/public/interfaces/BUILD.gn
index 1aa7fc5..1aa7fc5 100644
--- a/mojo/application/public/interfaces/BUILD.gn
+++ b/mojo/shell/public/interfaces/BUILD.gn
diff --git a/mojo/application/public/interfaces/application.mojom b/mojo/shell/public/interfaces/application.mojom
index 34ed7be..f0a8724 100644
--- a/mojo/application/public/interfaces/application.mojom
+++ b/mojo/shell/public/interfaces/application.mojom
@@ -4,8 +4,8 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
-import "mojo/application/public/interfaces/shell.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/shell.mojom";
 
 // This is the primary interface implemented by every Mojo application. It
 // allows the application to receive its startup arguments from the shell, and
diff --git a/mojo/application/public/interfaces/application_manager.mojom b/mojo/shell/public/interfaces/application_manager.mojom
index 84d7e58..02d059a 100644
--- a/mojo/application/public/interfaces/application_manager.mojom
+++ b/mojo/shell/public/interfaces/application_manager.mojom
@@ -4,7 +4,7 @@
 
 module mojo.shell.mojom;
 
-import "mojo/application/public/interfaces/shell.mojom";
+import "mojo/shell/public/interfaces/shell.mojom";
 
 struct ApplicationInfo {
   int32 id;
diff --git a/mojo/application/public/interfaces/content_handler.mojom b/mojo/shell/public/interfaces/content_handler.mojom
index 7494a7b..5fdb826 100644
--- a/mojo/application/public/interfaces/content_handler.mojom
+++ b/mojo/shell/public/interfaces/content_handler.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/application.mojom";
+import "mojo/shell/public/interfaces/application.mojom";
 import "network/public/interfaces/url_loader.mojom";
 
 // Interface implemented by content handlers. To avoid race conditions with
diff --git a/mojo/application/public/interfaces/service_provider.mojom b/mojo/shell/public/interfaces/service_provider.mojom
index 8c81879..8c81879 100644
--- a/mojo/application/public/interfaces/service_provider.mojom
+++ b/mojo/shell/public/interfaces/service_provider.mojom
diff --git a/mojo/application/public/interfaces/shell.mojom b/mojo/shell/public/interfaces/shell.mojom
index e38f93c..b70b9fe 100644
--- a/mojo/application/public/interfaces/shell.mojom
+++ b/mojo/shell/public/interfaces/shell.mojom
@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "mojo/application/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/service_provider.mojom";
 import "network/public/interfaces/url_loader.mojom";
 
 // Specifies a whitelist of applications and services an application can connect
diff --git a/mojo/application/public/java/BUILD.gn b/mojo/shell/public/java/BUILD.gn
index 7caa8e7..a89d0fc 100644
--- a/mojo/application/public/java/BUILD.gn
+++ b/mojo/shell/public/java/BUILD.gn
@@ -14,8 +14,8 @@ android_library("application") {
     "src/org/chromium/mojo/application/ShellHelper.java",
   ]
   deps = [
-    "//mojo/application/public/interfaces:interfaces_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
+    "//mojo/shell/public/interfaces:interfaces_java",
   ]
 }
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationConnection.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
index 6b0e548..6b0e548 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationConnection.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
index 72b1c62..72b1c62 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationDelegate.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationImpl.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
index 7768b8d..7768b8d 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationImpl.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationRunner.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
index 1a903b4..1a903b4 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ApplicationRunner.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
index 462d74e..462d74e 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ServiceFactoryBinder.java
diff --git a/mojo/application/public/java/src/org/chromium/mojo/application/ShellHelper.java b/mojo/shell/public/java/src/org/chromium/mojo/application/ShellHelper.java
index 705e22e..705e22e 100644
--- a/mojo/application/public/java/src/org/chromium/mojo/application/ShellHelper.java
+++ b/mojo/shell/public/java/src/org/chromium/mojo/application/ShellHelper.java
diff --git a/mojo/shell/shell_application_delegate.cc b/mojo/shell/shell_application_delegate.cc
index 650740d..1dbac46 100644
--- a/mojo/shell/shell_application_delegate.cc
+++ b/mojo/shell/shell_application_delegate.cc
@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "base/process/process.h"
-#include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/public/cpp/application_connection.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 
 namespace mojo {
diff --git a/mojo/shell/shell_application_delegate.h b/mojo/shell/shell_application_delegate.h
index d2dd94b..d610b1a 100644
--- a/mojo/shell/shell_application_delegate.h
+++ b/mojo/shell/shell_application_delegate.h
@@ -5,14 +5,14 @@
 #ifndef MOJO_SHELL_SHELL_APPLICATION_DELEGATE_H_
 #define MOJO_SHELL_SHELL_APPLICATION_DELEGATE_H_
 
-#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/application_manager.mojom.h"
 #include "mojo/common/weak_binding_set.h"
+#include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/shell_application_loader.cc b/mojo/shell/shell_application_loader.cc
index 0370a98..6040517 100644
--- a/mojo/shell/shell_application_loader.cc
+++ b/mojo/shell/shell_application_loader.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/shell_application_delegate.h"
 
 namespace mojo {
diff --git a/mojo/shell/static_application_loader.cc b/mojo/shell/static_application_loader.cc
index 023d312..b609fcd 100644
--- a/mojo/shell/static_application_loader.cc
+++ b/mojo/shell/static_application_loader.cc
@@ -12,10 +12,10 @@
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/application/public/cpp/application_delegate.h"
-#include "mojo/application/public/cpp/application_runner.h"
-#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_runner.h"
+#include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace shell {
author	ben <ben@chromium.org>	2016-01-11 18:44:08 -0800
committer	Commit bot <commit-bot@chromium.org>	2016-01-12 02:44:59 +0000
commit	273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch)
tree	25da3f1a02f1f9d5f129ba8d794d20b51355a07b /mojo
parent	9c1122c7163411be938195ba546460ba54d33b00 (diff)
download	chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2