3 files changed, 3 insertions, 50 deletions
diff --git a/ui/gfx/android/gfx_jni_registrar.cc b/ui/gfx/android/gfx_jni_registrar.cc
deleted file mode 100644
index 8aa8551..0000000
--- a/ui/gfx/android/gfx_jni_registrar.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2013 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 "ui/gfx/android/gfx_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "ui/gfx/android/device_display_info.h"
-#include "ui/gfx/android/java_bitmap.h"
-
-namespace gfx {
-namespace android {
-
-static base::android::RegistrationMethod kGfxRegisteredMethods[] = {
-  { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
-  { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
-};
-
-bool RegisterJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kGfxRegisteredMethods,
-                               arraysize(kGfxRegisteredMethods));
-}
-
-}  // namespace android
-}  // namespace gfx
diff --git a/ui/gfx/android/gfx_jni_registrar.h b/ui/gfx/android/gfx_jni_registrar.h
deleted file mode 100644
index 3d4947c..0000000
--- a/ui/gfx/android/gfx_jni_registrar.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
-#define UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/gfx/gfx_export.h"
-
-namespace gfx {
-namespace android {
-
-// Register all JNI bindings necessary for chrome.
-GFX_EXPORT bool RegisterJni(JNIEnv* env);
-
-}  // namespace android
-}  // namespace gfx
-
-#endif  // UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
index 2a1be65..6c2eaa8 100644
--- a/ui/gfx/android/java_bitmap.cc
+++ b/ui/gfx/android/java_bitmap.cc
@@ -39,11 +39,11 @@ JavaBitmap::~JavaBitmap() {
 
 // static
 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
-  return RegisterNativesImpl(env);
+  return ui::RegisterNativesImpl(env);
 }
 
 static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
-  return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
+  return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
       size.width(), size.height());
 }
 
@@ -87,7 +87,7 @@ SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) {
   DCHECK(!size.IsEmpty());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
-  ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
+  ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
       env, jname.obj(), size.width(), size.height()));
   if (jobj.is_null())
     return SkBitmap();