NOT FOR REVIEW: Aura on Android

content/shell/android/shell_jni_registrar.cc

 // Copyright (c) 2012 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 "content/shell/android/shell_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #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},
+    {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils},
+#if defined(USE_AURA)
+    {"platform_window", ui::RegisterPlatformWindowJni},
+#else
     {"ShellManager", content::RegisterShellManager},
-    {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils},
+#endif
 };
 
 }  // namespace
 
 namespace content {
 namespace android {
 
 bool RegisterShellJni(JNIEnv* env) {
+  LOG(ERROR) << "   ~~~ RegisterShellJni";
   return RegisterNativeMethods(env, kShellRegistrationMethods,
                                arraysize(kShellRegistrationMethods));
 }
 
 }  // namespace android
 }  // namespace content