Move shell interfaces into the shell.mojom namespace.

mojo/shell/standalone/android/android_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/standalone/android/android_handler.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/android/context_utils.h"
@@ skipping 23 matching lines @@
 namespace {
 
 // This function loads the application library, sets the application context and
 // thunks and calls into the application MojoMain. To ensure that the thunks are
 // set correctly we keep it in the Mojo shell .so and pass the function pointer
 // to the helper libbootstrap.so.
 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.
   // TODO(vtl): We'd use a ScopedNativeLibrary, but it doesn't have .get()!
   base::NativeLibrary app_library = LoadNativeApplication(app_path);
   if (!app_library)
     return;
 
   // Set the application context if needed. Most applications will need to
   // access the Android ApplicationContext in which they are run. If the
@@ skipping 69 matching lines @@
   return true;
 }
 
 }  // namespace
 
 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;
   if (!response->url.is_null()) {
     base::FilePath internal_app_path;
     base::FilePath path_to_mojo;
     if (IsCachedApp(env, GURL(response->url.get()), &internal_app_path,
                     &path_to_mojo)) {
       ScopedJavaLocalRef<jstring> j_internal_app_path(
           ConvertUTF8ToJavaString(env, internal_app_path.value()));
@@ skipping 25 matching lines @@
   connection->AddService(&content_handler_factory_);
   return true;
 }
 
 bool RegisterAndroidHandlerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
 }  // namespace mojo