Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/app/android/chrome_android_initializer.cc

Index: chrome/app/android/chrome_android_initializer.cc
diff --git a/android_webview/lib/main/webview_entry_point.cc b/chrome/app/android/chrome_android_initializer.cc
similarity index 52%
copy from android_webview/lib/main/webview_entry_point.cc
copy to chrome/app/android/chrome_android_initializer.cc
index 567161edcecc4303492a23f27f1fb679466ecbcc..91d1f1a44e97d7f461c7cd59d8c047627728b634 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/chrome/app/android/chrome_android_initializer.cc
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/lib/main/aw_main_delegate.h"
-#include "android_webview/native/android_webview_jni_registrar.h"
+#include "chrome/app/android/chrome_android_initializer.h"
+
 #include "base/android/jni_android.h"
+#include "base/logging.h"
+#include "chrome/app/android/chrome_main_delegate_android.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 
-// This is called by the VM when the shared library is first loaded.
-// Most of the initialization is done in LibraryLoadedOnMainThread(), not here.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
-  if (!android_webview::RegisterJni(env))
-    return -1;
-
-  content::SetContentMainDelegate(new android_webview::AwMainDelegate());
+  DCHECK(main_delegate);
+  content::SetContentMainDelegate(main_delegate);
 
   return JNI_VERSION_1_4;
 }