ui: Android changes.

ui/base/android/ui_base_jni_registrar.cc

Index: ui/base/android/ui_base_jni_registrar.cc
diff --git a/ui/base/android/ui_jni_registrar.cc b/ui/base/android/ui_base_jni_registrar.cc
similarity index 72%
rename from ui/base/android/ui_jni_registrar.cc
rename to ui/base/android/ui_base_jni_registrar.cc
index 6ab21744a83f01d39163c395f3a69478566d5b88..34b00c7be50eceb21ad990f26e6e95037c87430c 100644
--- a/ui/base/android/ui_jni_registrar.cc
+++ b/ui/base/android/ui_base_jni_registrar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
@@ -10,17 +10,15 @@
 #include "ui/base/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"
 
 namespace ui {
 namespace android {
 
 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
-  { "Clipboard", ui::RegisterClipboardAndroid },
+  { "Clipboard", RegisterClipboardAndroid },
   { "LocalizationUtils", l10n_util::RegisterLocalizationUtil },
-  { "ViewAndroid", ui::ViewAndroid::RegisterViewAndroid },
-  { "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid },
+  { "ViewAndroid", ViewAndroid::RegisterViewAndroid },
+  { "WindowAndroid", WindowAndroid::RegisterWindowAndroid },
 };
 
 bool RegisterJni(JNIEnv* env) {