Move application_manager from /mojo to /shell.

application_manager is an implementation detail of the shell.

BUG=430984
R=jamesr@chromium.org

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

mojo/BUILD.gn

diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index c78160d..bc8659a 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -47,7 +47,6 @@
 group("tests") {
   testonly = true
   deps = [
-    "//mojo/application_manager:mojo_application_manager_unittests",
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/edk/js/test:js_unittests",

mojo/services/view_manager/public/cpp/tests/BUILD.gn

diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
index 4ccedc9..ec164ac 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
@@ -13,7 +13,6 @@
   deps = [
     "//base",
     "//base/test:test_support",
-    "//mojo/application_manager",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/application",
@@ -22,6 +21,7 @@
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/cpp/lib:run_unittests",
     "//mojo/services/view_manager/public/interfaces",
+    "//shell/application_manager",
     "//shell:test_support",
     "//testing/gtest",
   ]

mojo/services/view_manager/public/cpp/tests/DEPS

diff --git a/mojo/services/view_manager/public/cpp/tests/DEPS b/mojo/services/view_manager/public/cpp/tests/DEPS
index 7f57796..af27b9a 100644
--- a/mojo/services/view_manager/public/cpp/tests/DEPS
+++ b/mojo/services/view_manager/public/cpp/tests/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "!mojo/application_manager",
+  "!shell/application_manager",
   "!shell/shell_test_helper.h",
   "+mojo/services/geometry/public",
 ]

mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc

diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
index abdb095..bbfc742 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
+++ b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ -20,6 +19,7 @@
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
+#include "shell/application_manager/application_manager.h"
 #include "shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

services/window_manager/BUILD.gn

diff --git a/services/window_manager/BUILD.gn b/services/window_manager/BUILD.gn
index 0cb30ff..9309721 100644
--- a/services/window_manager/BUILD.gn
+++ b/services/window_manager/BUILD.gn
@@ -82,7 +82,6 @@
 
   deps = [
     "//base/test:test_support",
-    "//mojo/application_manager",
     "//mojo/converters/geometry",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
@@ -90,6 +89,7 @@
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
     "//mojo/services/window_manager/public/interfaces",
+    "//shell/application_manager",
     "//shell:test_support",
     "//testing/gtest",
     "//ui/events:test_support",

services/window_manager/window_manager_api_unittest.cc

diff --git a/services/window_manager/window_manager_api_unittest.cc b/services/window_manager/window_manager_api_unittest.cc
index b3b8dbb..d1729dd 100644
--- a/services/window_manager/window_manager_api_unittest.cc
+++ b/services/window_manager/window_manager_api_unittest.cc
@@ -6,7 +6,6 @@
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
-#include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ -18,6 +17,7 @@
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "shell/application_manager/application_manager.h"
 #include "shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

shell/BUILD.gn

diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index d1bba63..63fcde4 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -35,6 +35,7 @@
   deps = [
     ":external_application_unittests",
     ":mojo_shell_tests",
+    "//shell/application_manager:mojo_application_manager_unittests",
   ]
 }
 
@@ -71,8 +72,8 @@
 
       deps += [
         ":jni_headers",
-        "//mojo/application_manager:application_manager",
         "//services/native_viewport:lib",
+        "//shell/application_manager",
         "//ui/gl",
       ]
     }
@@ -178,13 +179,13 @@
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//mojo/application",
-    "//mojo/application_manager",
     "//mojo/common",
     "//mojo/common:tracing_impl",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/application",
     "//mojo/services/network/public/interfaces",
+    "//shell/application_manager",
     "//shell/domain_socket",
     "//services/tracing:bindings",
     "//url",
@@ -424,12 +425,12 @@
     "//testing/gtest",
     "//net:test_support",
     "//url",
-    "//mojo/application_manager",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//services/test_service:bindings",
+    "//shell/application_manager",
   ]
 
   datadeps = [
@@ -458,8 +459,8 @@
     ":init",
     ":lib",
     "//base",
-    "//mojo/application_manager",
     "//mojo/edk/system",
+    "//shell/application_manager",
   ]
 }
 
@@ -479,10 +480,10 @@
     "//testing/gtest",
     "//url",
     "//mojo/application",
-    "//mojo/application_manager",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//shell/application_manager",
     "//shell/domain_socket",
     "//shell/domain_socket:tests",
   ]

shell/android/android_handler_loader.h

diff --git a/shell/android/android_handler_loader.h b/shell/android/android_handler_loader.h
index 19e7fa6..9360574 100644
--- a/shell/android/android_handler_loader.h
+++ b/shell/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_manager/application_loader.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "shell/android/android_handler.h"
+#include "shell/application_manager/application_loader.h"
 
 namespace mojo {
 namespace shell {

shell/android/background_application_loader.cc

diff --git a/shell/android/background_application_loader.cc b/shell/android/background_application_loader.cc
index 8e6d0f4..0f72c3c 100644
--- a/shell/android/background_application_loader.cc
+++ b/shell/android/background_application_loader.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/run_loop.h"
-#include "mojo/application_manager/application_manager.h"
+#include "shell/application_manager/application_manager.h"
 
 namespace mojo {
 

shell/android/background_application_loader.h

diff --git a/shell/android/background_application_loader.h b/shell/android/background_application_loader.h
index 5321d97..4650ed6 100644
--- a/shell/android/background_application_loader.h
+++ b/shell/android/background_application_loader.h
@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/application_manager/application_loader.h"
+#include "shell/application_manager/application_loader.h"
 
 namespace mojo {
 

shell/android/mojo_main.cc

diff --git a/shell/android/mojo_main.cc b/shell/android/mojo_main.cc
index 06581ae..502a340 100644
--- a/shell/android/mojo_main.cc
+++ b/shell/android/mojo_main.cc
@@ -20,12 +20,12 @@
 #include "base/run_loop.h"
 #include "base/threading/simple_thread.h"
 #include "jni/MojoMain_jni.h"
-#include "mojo/application_manager/application_loader.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "shell/android/android_handler_loader.h"
 #include "shell/android/background_application_loader.h"
 #include "shell/android/native_viewport_application_loader.h"
 #include "shell/android/ui_application_loader_android.h"
+#include "shell/application_manager/application_loader.h"
 #include "shell/command_line_util.h"
 #include "shell/context.h"
 #include "shell/init.h"

shell/android/native_viewport_application_loader.h

diff --git a/shell/android/native_viewport_application_loader.h b/shell/android/native_viewport_application_loader.h
index ecaca49..f5d53ea 100644
--- a/shell/android/native_viewport_application_loader.h
+++ b/shell/android/native_viewport_application_loader.h
@@ -5,12 +5,12 @@
 #ifndef MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 #define MOJO_SHELL_ANDROID_NATIVE_VIEWPORT_APPLICATION_LOADER_H_
 
-#include "mojo/application_manager/application_loader.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
 #include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "services/gles2/gpu_impl.h"
+#include "shell/application_manager/application_loader.h"
 
 namespace mojo {
 

shell/android/ui_application_loader_android.cc

diff --git a/shell/android/ui_application_loader_android.cc b/shell/android/ui_application_loader_android.cc
index ca4ff8b..dca237c 100644
--- a/shell/android/ui_application_loader_android.cc
+++ b/shell/android/ui_application_loader_android.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application_manager/application_manager.h"
+#include "shell/application_manager/application_manager.h"
 
 namespace mojo {
 

shell/android/ui_application_loader_android.h

diff --git a/shell/android/ui_application_loader_android.h b/shell/android/ui_application_loader_android.h
index 7de34c7..26ac13b 100644
--- a/shell/android/ui_application_loader_android.h
+++ b/shell/android/ui_application_loader_android.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application_manager/application_loader.h"
+#include "shell/application_manager/application_loader.h"
 
 namespace base {
 class MessageLoop;

shell/application_manager/BUILD.gn

diff --git a/mojo/application_manager/BUILD.gn b/shell/application_manager/BUILD.gn
similarity index 92%
rename from mojo/application_manager/BUILD.gn
rename to shell/application_manager/BUILD.gn
index f5a5ee9..c6828d7 100644
--- a/mojo/application_manager/BUILD.gn
+++ b/shell/application_manager/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-# GYP version: mojo.gyp:mojo_application_manager
 component("application_manager") {
   output_name = "mojo_application_manager"
   sources = [
@@ -37,7 +36,6 @@
   ]
 }
 
-# GYP version: mojo.gyp:mojo_application_manager_unittests
 test("mojo_application_manager_unittests") {
   sources = [
     "application_manager_unittest.cc",

shell/application_manager/application_loader.cc

diff --git a/mojo/application_manager/application_loader.cc b/shell/application_manager/application_loader.cc
similarity index 90%
rename from mojo/application_manager/application_loader.cc
rename to shell/application_manager/application_loader.cc
index ac98b63..ea653a1 100644
--- a/mojo/application_manager/application_loader.cc
+++ b/shell/application_manager/application_loader.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_manager/application_loader.h"
+#include "shell/application_manager/application_loader.h"
 
 #include "base/bind.h"
 #include "base/logging.h"

shell/application_manager/application_loader.h

diff --git a/mojo/application_manager/application_loader.h b/shell/application_manager/application_loader.h
similarity index 89%
rename from mojo/application_manager/application_loader.h
rename to shell/application_manager/application_loader.h
index a1d16bd..7dffe0a 100644
--- a/mojo/application_manager/application_loader.h
+++ b/shell/application_manager/application_loader.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
-#define MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
+#ifndef SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_
+#define SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_
 
 #include "base/callback.h"
-#include "mojo/application_manager/application_manager_export.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "shell/application_manager/application_manager_export.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -55,4 +55,4 @@
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_MANAGER_APPLICATION_LOADER_H_
+#endif  // SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_

shell/application_manager/application_manager.cc

diff --git a/mojo/application_manager/application_manager.cc b/shell/application_manager/application_manager.cc
similarity index 98%
rename from mojo/application_manager/application_manager.cc
rename to shell/application_manager/application_manager.cc
index 2d58216..2ead72e 100644
--- a/mojo/application_manager/application_manager.cc
+++ b/shell/application_manager/application_manager.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_manager/application_manager.h"
+#include "shell/application_manager/application_manager.h"
 
 #include <stdio.h>
 
@@ -11,7 +11,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
-#include "mojo/application_manager/application_loader.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"

shell/application_manager/application_manager.h

diff --git a/mojo/application_manager/application_manager.h b/shell/application_manager/application_manager.h
similarity index 93%
rename from mojo/application_manager/application_manager.h
rename to shell/application_manager/application_manager.h
index 75a3d06..c420e51 100644
--- a/mojo/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.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_MANAGER_APPLICATION_MANAGER_H_
-#define MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
+#ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
+#define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <set>
@@ -12,10 +12,10 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application_manager/application_loader.h"
-#include "mojo/application_manager/application_manager_export.h"
-#include "mojo/application_manager/shell_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "shell/application_manager/application_loader.h"
+#include "shell/application_manager/application_manager_export.h"
+#include "shell/application_manager/shell_impl.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -153,4 +153,4 @@
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
+#endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_

shell/application_manager/application_manager_export.h

diff --git a/mojo/application_manager/application_manager_export.h b/shell/application_manager/application_manager_export.h
similarity index 78%
rename from mojo/application_manager/application_manager_export.h
rename to shell/application_manager/application_manager_export.h
index 9af43cf..7b3f357 100644
--- a/mojo/application_manager/application_manager_export.h
+++ b/shell/application_manager/application_manager_export.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_MANAGER_APPLICATION_MANAGER_EXPORT_H_
-#define MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_
+#ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_
+#define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 
@@ -29,4 +29,4 @@
 #define MOJO_APPLICATION_MANAGER_EXPORT
 #endif
 
-#endif  // MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_
+#endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_

shell/application_manager/application_manager_unittest.cc

diff --git a/mojo/application_manager/application_manager_unittest.cc b/shell/application_manager/application_manager_unittest.cc
similarity index 98%
rename from mojo/application_manager/application_manager_unittest.cc
rename to shell/application_manager/application_manager_unittest.cc
index c3b7d48..f1a09cd 100644
--- a/mojo/application_manager/application_manager_unittest.cc
+++ b/shell/application_manager/application_manager_unittest.cc
@@ -7,14 +7,14 @@
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/application_manager/application_loader.h"
-#include "mojo/application_manager/application_manager.h"
-#include "mojo/application_manager/test.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "shell/application_manager/application_loader.h"
+#include "shell/application_manager/application_manager.h"
+#include "shell/application_manager/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

shell/application_manager/shell_impl.cc

diff --git a/mojo/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
similarity index 94%
rename from mojo/application_manager/shell_impl.cc
rename to shell/application_manager/shell_impl.cc
index 9d39177..0d2b59d 100644
--- a/mojo/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.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_manager/shell_impl.h"
+#include "shell/application_manager/shell_impl.h"
 
-#include "mojo/application_manager/application_manager.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "shell/application_manager/application_manager.h"
 
 namespace mojo {
 

shell/application_manager/shell_impl.h

diff --git a/mojo/application_manager/shell_impl.h b/shell/application_manager/shell_impl.h
similarity index 92%
rename from mojo/application_manager/shell_impl.h
rename to shell/application_manager/shell_impl.h
index 58e3066..ef4de83 100644
--- a/mojo/application_manager/shell_impl.h
+++ b/shell/application_manager/shell_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_MANAGER_SHELL_IMPL_H_
-#define MOJO_APPLICATION_MANAGER_SHELL_IMPL_H_
+#ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
+#define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
@@ -59,4 +59,4 @@
 
 }  // namespace mojo
 
-#endif  // MOJO_APPLICATION_MANAGER_SHELL_IMPL_H_
+#endif  // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_

shell/application_manager/test.mojom

diff --git a/mojo/application_manager/test.mojom b/shell/application_manager/test.mojom
similarity index 100%
rename from mojo/application_manager/test.mojom
rename to shell/application_manager/test.mojom

shell/context.cc

diff --git a/shell/context.cc b/shell/context.cc
index 76a9076..d3a8613 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -16,8 +16,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
-#include "mojo/application_manager/application_loader.h"
-#include "mojo/application_manager/application_manager.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
@@ -25,6 +23,8 @@
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "services/tracing/tracing.mojom.h"
+#include "shell/application_manager/application_loader.h"
+#include "shell/application_manager/application_manager.h"
 #include "shell/dynamic_application_loader.h"
 #include "shell/external_application_listener.h"
 #include "shell/in_process_dynamic_service_runner.h"

shell/context.h

diff --git a/shell/context.h b/shell/context.h
index 605719a..ab30f14 100644
--- a/shell/context.h
+++ b/shell/context.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "mojo/application_manager/application_manager.h"
+#include "shell/application_manager/application_manager.h"
 #include "shell/mojo_url_resolver.h"
 #include "shell/task_runners.h"
 

shell/dynamic_application_loader.h

diff --git a/shell/dynamic_application_loader.h b/shell/dynamic_application_loader.h
index e0c553a..7780b78 100644
--- a/shell/dynamic_application_loader.h
+++ b/shell/dynamic_application_loader.h
@@ -11,9 +11,9 @@
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/application_manager/application_loader.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "shell/application_manager/application_loader.h"
 #include "shell/dynamic_service_runner.h"
 #include "url/gurl.h"
 

shell/external_application_listener_unittest.cc

diff --git a/shell/external_application_listener_unittest.cc b/shell/external_application_listener_unittest.cc
index f8e7316..ebc1a65 100644
--- a/shell/external_application_listener_unittest.cc
+++ b/shell/external_application_listener_unittest.cc
@@ -8,12 +8,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
-#include "mojo/application_manager/application_loader.h"
-#include "mojo/application_manager/application_manager.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
+#include "shell/application_manager/application_loader.h"
+#include "shell/application_manager/application_manager.h"
 #include "shell/domain_socket/net_errors.h"
 #include "shell/domain_socket/test_completion_callback.h"
 #include "shell/domain_socket/unix_domain_client_socket_posix.h"

shell/shell_test_helper.h

diff --git a/shell/shell_test_helper.h b/shell/shell_test_helper.h
index 5d6cb5e..4a29818 100644
--- a/shell/shell_test_helper.h
+++ b/shell/shell_test_helper.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "mojo/application_manager/application_loader.h"
+#include "shell/application_manager/application_loader.h"
 #include "shell/context.h"
 
 class GURL;