Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/android/android_handler.cc

Index: mojo/shell/standalone/android/android_handler.cc
diff --git a/mojo/runner/android/android_handler.cc b/mojo/shell/standalone/android/android_handler.cc
similarity index 94%
rename from mojo/runner/android/android_handler.cc
rename to mojo/shell/standalone/android/android_handler.cc
index 857a48fd8e1be616b04c2c511c416ddff68312e8..dbc41ad26dd03cc20001f8c5cecf056bf93346e2 100644
--- a/mojo/runner/android/android_handler.cc
+++ b/mojo/shell/standalone/android/android_handler.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/runner/android/android_handler.h"
+#include "mojo/shell/standalone/android/android_handler.h"
 
 #include <stddef.h>
 #include <utility>
@@ -16,9 +16,9 @@
 #include "jni/AndroidHandler_jni.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/shell/public/cpp/application_impl.h"
 #include "mojo/shell/runner/host/native_application_support.h"
+#include "mojo/shell/standalone/android/run_android_application_function.h"
 #include "mojo/util/filename_util.h"
 #include "url/gurl.h"
 
@@ -29,7 +29,7 @@ using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 
 namespace mojo {
-namespace runner {
+namespace shell {
 
 namespace {
 
@@ -47,7 +47,7 @@ void RunAndroidApplication(JNIEnv* env,
   // 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 = shell::LoadNativeApplication(app_path);
+  base::NativeLibrary app_library = LoadNativeApplication(app_path);
   if (!app_library)
     return;
 
@@ -68,7 +68,7 @@ void RunAndroidApplication(JNIEnv* env,
   }
 
   // Run the application.
-  shell::RunNativeApplication(app_library, std::move(application_request));
+  RunNativeApplication(app_library, std::move(application_request));
   // TODO(vtl): See note about unloading and thread-local destructors above
   // declaration of |LoadNativeApplication()|.
   base::UnloadNativeLibrary(app_library);
@@ -127,11 +127,9 @@ bool IsCachedApp(JNIEnv* env,
 
 }  // namespace
 
-AndroidHandler::AndroidHandler() : content_handler_factory_(this) {
-}
+AndroidHandler::AndroidHandler() : content_handler_factory_(this) {}
 
-AndroidHandler::~AndroidHandler() {
-}
+AndroidHandler::~AndroidHandler() {}
 
 void AndroidHandler::RunApplication(
     InterfaceRequest<Application> application_request,
@@ -167,8 +165,7 @@ void AndroidHandler::RunApplication(
       reinterpret_cast<jlong>(run_android_application_fn));
 }
 
-void AndroidHandler::Initialize(ApplicationImpl* app) {
-}
+void AndroidHandler::Initialize(ApplicationImpl* app) {}
 
 bool AndroidHandler::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
@@ -180,5 +177,5 @@ bool RegisterAndroidHandlerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo