NOT FOR REVIEW: Aura on Android

content/shell/android/shell_jni_registrar.cc

Index: content/shell/android/shell_jni_registrar.cc
diff --git a/content/shell/android/shell_jni_registrar.cc b/content/shell/android/shell_jni_registrar.cc
index 65628733b7b9a2934c8ce411fd333397a5e4e668..49bed082a1127d2e3fefa903aaa20711aef6b7c0 100644
--- a/content/shell/android/shell_jni_registrar.cc
+++ b/content/shell/android/shell_jni_registrar.cc
@@ -9,13 +9,18 @@
 #include "content/shell/android/shell_manager.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_mojo_test_utils_android.h"
+#include "ui/platform_window/android/platform_window_jni_registrar.h"
 
 namespace {
 
 static base::android::RegistrationMethod kShellRegistrationMethods[] = {
     {"Shell", content::Shell::Register},
-    {"ShellManager", content::RegisterShellManager},
     {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils},
+#if defined(USE_AURA)
+    {"platform_window", ui::RegisterPlatformWindowJni},
+#else
+    {"ShellManager", content::RegisterShellManager},
+#endif
 };
 
 }  // namespace
@@ -24,6 +29,7 @@ namespace content {
 namespace android {
 
 bool RegisterShellJni(JNIEnv* env) {
+  LOG(ERROR) << "   ~~~ RegisterShellJni";
   return RegisterNativeMethods(env, kShellRegistrationMethods,
                                arraysize(kShellRegistrationMethods));
 }