[Android] Rename NativeWindow to WindowAndroid.

ui/android/ui_jni_registrar.cc

Index: ui/android/ui_jni_registrar.cc
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
index e2ddac13040b06369b2c3cc25dc8eac0d3f35fae..5a0149b0706319bba0899ca42908f92e64d5d89f 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/android/ui_jni_registrar.cc
@@ -6,21 +6,21 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "ui/android/window_android.h"
 #include "ui/base/clipboard/clipboard_android_initialization.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
-#include "ui/gfx/android/window_android.h"
 
 namespace ui {
 namespace android {
 
 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
+  { "Clipboard", ui::RegisterClipboardAndroid },
   { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
   { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
   { "LocalizationUtils", l10n_util::RegisterLocalizationUtil },
-  { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid },
-  { "Clipboard", ui::RegisterClipboardAndroid },
+  { "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid },
 };
 
 bool RegisterJni(JNIEnv* env) {