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

mojo/shell/android/library_loader.cc

Index: mojo/shell/android/library_loader.cc
diff --git a/mojo/shell/android/library_loader.cc b/mojo/shell/android/library_loader.cc
deleted file mode 100644
index c43a4b52a728377036373e01a6b28fa41dad85b8..0000000000000000000000000000000000000000
--- a/mojo/shell/android/library_loader.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 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/base_jni_onload.h"
-#include "base/android/base_jni_registrar.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/bind.h"
-#include "components/native_viewport/platform_viewport_android.h"
-#include "mojo/shell/android/android_handler.h"
-#include "mojo/shell/android/main.h"
-
-namespace {
-
-base::android::RegistrationMethod kMojoRegisteredMethods[] = {
-    {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni},
-    {"PlatformViewportAndroid",
-     native_viewport::PlatformViewportAndroid::Register},
-    {"ShellMain", mojo::shell::RegisterShellMain},
-};
-
-bool RegisterJNI(JNIEnv* env) {
-  if (!base::android::RegisterJni(env))
-    return false;
-
-  return RegisterNativeMethods(env, kMojoRegisteredMethods,
-                               arraysize(kMojoRegisteredMethods));
-}
-
-}  // namespace
-
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  std::vector<base::android::RegisterCallback> register_callbacks;
-  register_callbacks.push_back(base::Bind(&RegisterJNI));
-  if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
-      !base::android::OnJNIOnLoadInit(
-          std::vector<base::android::InitCallback>())) {
-    return -1;
-  }
-
-  return JNI_VERSION_1_4;
-}