Move shell interfaces into the shell.mojom namespace.

TBR=rockot@chromium.org
R=palmer@chromium.org
BUG=none
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

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

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

9 files changed, 16 insertions, 15 deletions

diff --git a/mojo/shell/standalone/android/android_handler.cc b/mojo/shell/standalone/android/android_handler.cc
index 6e3ad3c..f3de55f 100644
--- a/mojo/shell/standalone/android/android_handler.cc
+++ b/mojo/shell/standalone/android/android_handler.cc
@@ -41,8 +41,9 @@ void RunAndroidApplication(JNIEnv* env,
                            jobject j_context,
                            const base::FilePath& app_path,
                            jint j_handle) {
-  InterfaceRequest<Application> application_request =
-      MakeRequest<Application>(MakeScopedHandle(MessagePipeHandle(j_handle)));
+  InterfaceRequest<mojom::Application> application_request =
+      MakeRequest<mojom::Application>(
+          MakeScopedHandle(MessagePipeHandle(j_handle)));
 
   // Load the library, so that we can set the application context there if
   // needed.
@@ -132,7 +133,7 @@ AndroidHandler::AndroidHandler() : content_handler_factory_(this) {}
 AndroidHandler::~AndroidHandler() {}
 
 void AndroidHandler::RunApplication(
-    InterfaceRequest<Application> application_request,
+    InterfaceRequest<mojom::Application> application_request,
     URLResponsePtr response) {
   JNIEnv* env = AttachCurrentThread();
   RunAndroidApplicationFn run_android_application_fn = &RunAndroidApplication;
diff --git a/mojo/shell/standalone/android/android_handler.h b/mojo/shell/standalone/android/android_handler.h
index ac25ea1..1169699 100644
--- a/mojo/shell/standalone/android/android_handler.h
+++ b/mojo/shell/standalone/android/android_handler.h
@@ -31,7 +31,7 @@ class AndroidHandler : public ApplicationDelegate,
   bool AcceptConnection(ApplicationConnection* connection) override;
 
   // ContentHandlerFactory::Delegate:
-  void RunApplication(InterfaceRequest<Application> application_request,
+  void RunApplication(InterfaceRequest<mojom::Application> application_request,
                       URLResponsePtr response) override;
 
   ContentHandlerFactory content_handler_factory_;
diff --git a/mojo/shell/standalone/android/android_handler_loader.cc b/mojo/shell/standalone/android/android_handler_loader.cc
index ef7b202..1c1bb5e 100644
--- a/mojo/shell/standalone/android/android_handler_loader.cc
+++ b/mojo/shell/standalone/android/android_handler_loader.cc
@@ -15,7 +15,7 @@ AndroidHandlerLoader::~AndroidHandlerLoader() {}
 
 void AndroidHandlerLoader::Load(
     const GURL& url,
-    InterfaceRequest<Application> application_request) {
+    InterfaceRequest<mojom::Application> application_request) {
   DCHECK(application_request.is_pending());
   application_.reset(
       new ApplicationImpl(&android_handler_, std::move(application_request)));
diff --git a/mojo/shell/standalone/android/android_handler_loader.h b/mojo/shell/standalone/android/android_handler_loader.h
index 0136742..18255d5 100644
--- a/mojo/shell/standalone/android/android_handler_loader.h
+++ b/mojo/shell/standalone/android/android_handler_loader.h
@@ -23,7 +23,7 @@ class AndroidHandlerLoader : public ApplicationLoader {
  private:
   // ApplicationLoader overrides:
   void Load(const GURL& url,
-            InterfaceRequest<Application> application_request) override;
+            InterfaceRequest<mojom::Application> application_request) override;
 
   AndroidHandler android_handler_;
   scoped_ptr<ApplicationImpl> application_;
diff --git a/mojo/shell/standalone/android/background_application_loader.cc b/mojo/shell/standalone/android/background_application_loader.cc
index da433e7..8bd3869 100644
--- a/mojo/shell/standalone/android/background_application_loader.cc
+++ b/mojo/shell/standalone/android/background_application_loader.cc
@@ -29,7 +29,7 @@ BackgroundApplicationLoader::~BackgroundApplicationLoader() {
 
 void BackgroundApplicationLoader::Load(
     const GURL& url,
-    InterfaceRequest<Application> application_request) {
+    InterfaceRequest<mojom::Application> application_request) {
   DCHECK(application_request.is_pending());
   if (!thread_) {
     // TODO(tim): It'd be nice if we could just have each Load call
@@ -65,7 +65,7 @@ void BackgroundApplicationLoader::Run() {
 
 void BackgroundApplicationLoader::LoadOnBackgroundThread(
     const GURL& url,
-    InterfaceRequest<Application> application_request) {
+    InterfaceRequest<mojom::Application> application_request) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   loader_->Load(url, std::move(application_request));
 }
diff --git a/mojo/shell/standalone/android/background_application_loader.h b/mojo/shell/standalone/android/background_application_loader.h
index 2e25e55..203ce54 100644
--- a/mojo/shell/standalone/android/background_application_loader.h
+++ b/mojo/shell/standalone/android/background_application_loader.h
@@ -26,7 +26,7 @@ class BackgroundApplicationLoader
 
   // ApplicationLoader overrides:
   void Load(const GURL& url,
-            InterfaceRequest<Application> application_request) override;
+            InterfaceRequest<mojom::Application> application_request) override;
 
  private:
   // |base::DelegateSimpleThread::Delegate| method:
@@ -36,7 +36,7 @@ class BackgroundApplicationLoader
   // to |background_loader_| to do the actual loading.
   void LoadOnBackgroundThread(
       const GURL& url,
-      InterfaceRequest<Application> application_request);
+      InterfaceRequest<mojom::Application> application_request);
   bool quit_on_shutdown_;
   scoped_ptr<ApplicationLoader> loader_;
 
diff --git a/mojo/shell/standalone/android/background_application_loader_unittest.cc b/mojo/shell/standalone/android/background_application_loader_unittest.cc
index 9f66bf1..b7c1712 100644
--- a/mojo/shell/standalone/android/background_application_loader_unittest.cc
+++ b/mojo/shell/standalone/android/background_application_loader_unittest.cc
@@ -18,7 +18,7 @@ class DummyLoader : public ApplicationLoader {
 
   // ApplicationLoader overrides:
   void Load(const GURL& url,
-            InterfaceRequest<Application> application_request) override {
+            InterfaceRequest<mojom::Application> application_request) override {
     if (simulate_app_quit_)
       base::MessageLoop::current()->QuitWhenIdle();
   }
diff --git a/mojo/shell/standalone/android/ui_application_loader_android.cc b/mojo/shell/standalone/android/ui_application_loader_android.cc
index 10ec448..39ebb8d 100644
--- a/mojo/shell/standalone/android/ui_application_loader_android.cc
+++ b/mojo/shell/standalone/android/ui_application_loader_android.cc
@@ -26,7 +26,7 @@ UIApplicationLoader::~UIApplicationLoader() {
 
 void UIApplicationLoader::Load(
     const GURL& url,
-    InterfaceRequest<Application> application_request) {
+    InterfaceRequest<mojom::Application> application_request) {
   DCHECK(application_request.is_pending());
   ui_message_loop_->PostTask(
       FROM_HERE,
@@ -36,7 +36,7 @@ void UIApplicationLoader::Load(
 
 void UIApplicationLoader::LoadOnUIThread(
     const GURL& url,
-    InterfaceRequest<Application> application_request) {
+    InterfaceRequest<mojom::Application> application_request) {
   loader_->Load(url, std::move(application_request));
 }
 
diff --git a/mojo/shell/standalone/android/ui_application_loader_android.h b/mojo/shell/standalone/android/ui_application_loader_android.h
index c990ace..6a8c03e 100644
--- a/mojo/shell/standalone/android/ui_application_loader_android.h
+++ b/mojo/shell/standalone/android/ui_application_loader_android.h
@@ -29,7 +29,7 @@ class UIApplicationLoader : public ApplicationLoader {
 
   // ApplicationLoader overrides:
   void Load(const GURL& url,
-            InterfaceRequest<Application> application_request) override;
+            InterfaceRequest<mojom::Application> application_request) override;
 
  private:
   class UILoader;
@@ -39,7 +39,7 @@ class UIApplicationLoader : public ApplicationLoader {
   // TODO: having this code take a |manager| is fragile (as ApplicationManager
   // isn't thread safe).
   void LoadOnUIThread(const GURL& url,
-                      InterfaceRequest<Application> application_request);
+                      InterfaceRequest<mojom::Application> application_request);
   void ShutdownOnUIThread();
 
   scoped_ptr<ApplicationLoader> loader_;