Separate mojo/shell into a runner and the application manager (shell)

mojo/shell/android/bootstrap.cc

Index: mojo/shell/android/bootstrap.cc
diff --git a/mojo/shell/android/bootstrap.cc b/mojo/shell/android/bootstrap.cc
deleted file mode 100644
index 4fcae379f4162ba538f71fbe3b6c2dfcaae1844c..0000000000000000000000000000000000000000
--- a/mojo/shell/android/bootstrap.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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 "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "jni/Bootstrap_jni.h"
-#include "mojo/shell/android/run_android_application_function.h"
-
-namespace mojo {
-namespace shell {
-
-void Bootstrap(JNIEnv* env,
-               jobject,
-               jobject j_context,
-               jstring j_native_library_path,
-               jint j_handle,
-               jlong j_run_application_ptr) {
-  base::FilePath app_path(
-      base::android::ConvertJavaStringToUTF8(env, j_native_library_path));
-  RunAndroidApplicationFn run_android_application_fn =
-      reinterpret_cast<RunAndroidApplicationFn>(j_run_application_ptr);
-  run_android_application_fn(env, j_context, app_path, j_handle);
-}
-
-bool RegisterBootstrapJni(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-}  // namespace shell
-}  // namespace mojo
-
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
-
-  if (!mojo::shell::RegisterBootstrapJni(env))
-    return -1;
-
-  return JNI_VERSION_1_4;
-}