android: Remove manual jni registration in ui/

All generated RegisterNativesImpl functions are no-op already. Remove
all manual jni registration code in ui that calls these generated
RegisterNativesImpl calls.

TBR=garykac@chromium.org,zmo@chromium.org

Bug: 749244
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Iebbb9d91e5cc78d62b323113c5ccecd59a7311a8
Reviewed-on: https://chromium-review.googlesource.com/592333
Commit-Queue: Bo Liu <boliu@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491362}

android_webview/browser/aw_form_database_service_unittest.cc

@@ -14,7 +14,6 @@
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util_android.h"
 
 using autofill::AutofillWebDataService;
 using autofill::FormFieldData;
@@ -32,7 +31,6 @@ class AwFormDatabaseServiceTest : public Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     env_ = AttachCurrentThread();
     ASSERT_TRUE(env_ != NULL);
-    ASSERT_TRUE(l10n_util::RegisterLocalizationUtil(env_));
 
     service_.reset(new AwFormDatabaseService(temp_dir_.GetPath()));
   }

gpu/command_buffer/tests/gl_tests_main.cc

@@ -18,11 +18,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gl/init/gl_factory.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "ui/gl/android/gl_jni_registrar.h"
-#endif
-
 namespace {
 
 int RunHelper(base::TestSuite* testSuite) {
@@ -44,9 +39,6 @@ int RunHelper(base::TestSuite* testSuite) {
 }  // namespace
 
 int main(int argc, char** argv) {
-#if defined(OS_ANDROID)
-  ui::gl::android::RegisterJni(base::android::AttachCurrentThread());
-#endif
   base::TestSuite test_suite(argc, argv);
   base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)

media/test/run_all_unittests.cc

@@ -17,7 +17,6 @@
 #include "base/android/jni_android.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_jni_registrar.h"
-#include "ui/gl/android/gl_jni_registrar.h"
 #endif
 
 class TestSuiteNoAtExit : public base::TestSuite {
@@ -42,8 +41,6 @@ void TestSuiteNoAtExit::Initialize() {
 #if defined(OS_ANDROID)
   // Register JNI bindings for android.
   JNIEnv* env = base::android::AttachCurrentThread();
-  // Needed for surface texture support.
-  ui::gl::android::RegisterJni(env);
 
   media::RegisterJni(env);
 

remoting/client/jni/remoting_jni_onload.cc

@@ -11,12 +11,10 @@
 #include "net/android/net_jni_registrar.h"
 #include "remoting/client/jni/remoting_jni_registrar.h"
 #include "remoting/client/remoting_jni_registration.h"
-#include "ui/gfx/android/gfx_jni_registrar.h"
 
 namespace {
 
 base::android::RegistrationMethod kRemotingRegisteredMethods[] = {
-  {"gfx", gfx::android::RegisterJni},
   {"net", net::android::RegisterJni},
   {"remoting", remoting::RegisterJni},
 };

ui/android/BUILD.gn

@@ -34,15 +34,12 @@ component("android") {
     "resources/resource.cc",
     "resources/resource.h",
     "resources/resource_factory.cc",
-    "resources/resource_factory.h",
     "resources/resource_manager.h",
     "resources/resource_manager_impl.cc",
     "resources/resource_manager_impl.h",
     "resources/ui_resource_provider.h",
     "screen_android.h",
     "ui_android_export.h",
-    "ui_android_jni_registrar.cc",
-    "ui_android_jni_registrar.h",
     "view_android.cc",
     "view_android.h",
     "view_client.cc",

ui/android/display_android_manager.cc

@@ -32,10 +32,6 @@ void SetScreenAndroid() {
   Java_DisplayAndroidManager_onNativeSideCreated(env, (jlong)manager);
 }
 
-bool RegisterScreenAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 DisplayAndroidManager::DisplayAndroidManager() {}
 
 DisplayAndroidManager::~DisplayAndroidManager() {}

ui/android/event_forwarder.cc

@@ -161,8 +161,4 @@ void EventForwarder::OnDragEvent(JNIEnv* env,
   view_->OnDragEvent(event);
 }
 
-bool RegisterEventForwarder(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace ui

ui/android/event_forwarder.h

@@ -93,8 +93,6 @@ class EventForwarder {
   DISALLOW_COPY_AND_ASSIGN(EventForwarder);
 };
 
-bool RegisterEventForwarder(JNIEnv* env);
-
 }  // namespace ui
 
 #endif  // UI_ANDROID_EVENT_FORWARDER_H_

ui/android/resources/resource_factory.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/android/resources/resource_factory.h"
-
 #include "jni/ResourceFactory_jni.h"
 #include "ui/android/resources/nine_patch_resource.h"
 #include "ui/gfx/geometry/rect.h"
@@ -12,10 +10,6 @@ using base::android::JavaParamRef;
 
 namespace ui {
 
-bool RegisterResourceFactory(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 jlong CreateBitmapResource(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return reinterpret_cast<intptr_t>(new Resource());
 }

ui/android/resources/resource_factory.h

-// Copyright 2017 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_ANDROID_RESOURCES_RESOURCE_FACTORY_H_
-#define UI_ANDROID_RESOURCES_RESOURCE_FACTORY_H_
-
-#include "base/android/jni_android.h"
-
-namespace ui {
-
-bool RegisterResourceFactory(JNIEnv* env);
-
-}  // namespace ui
-
-#endif  // UI_ANDROID_RESOURCES_RESOURCE_FACTORY_H_

ui/android/resources/resource_manager_impl.cc

@@ -233,11 +233,6 @@ bool ResourceManagerImpl::OnMemoryDump(
   return true;
 }
 
-// static
-bool ResourceManagerImpl::RegisterResourceManager(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 void ResourceManagerImpl::PreloadResourceFromJava(AndroidResourceType res_type,
                                                   int res_id) {
   TRACE_EVENT2("ui", "ResourceManagerImpl::PreloadResourceFromJava",

ui/android/resources/resource_manager_impl.h

@@ -58,8 +58,6 @@ class UI_ANDROID_EXPORT ResourceManagerImpl
   void ClearTintedResourceCache(JNIEnv* env,
       const base::android::JavaRef<jobject>& jobj);
 
-  static bool RegisterResourceManager(JNIEnv* env);
-
   // base::trace_event::MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;

ui/android/run_all_unittests.cc

@@ -10,10 +10,8 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/android/ui_android_jni_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gfx/android/gfx_jni_registrar.h"
 
 namespace {
 
@@ -25,9 +23,6 @@ class UIAndroidTestSuite : public base::TestSuite {
   void Initialize() override {
     base::TestSuite::Initialize();
 
-    gfx::android::RegisterJni(base::android::AttachCurrentThread());
-    ui::RegisterUIAndroidJni(base::android::AttachCurrentThread());
-
     ui::RegisterPathProvider();
 
     base::FilePath ui_test_pak_path;

ui/android/screen_android.h

@@ -10,8 +10,6 @@
 
 namespace ui {
 
-bool RegisterScreenAndroid(JNIEnv* env);
-
 UI_ANDROID_EXPORT void SetScreenAndroid();
 
 }  // namespace display

ui/android/ui_android_jni_registrar.cc

-// Copyright 2014 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/android/ui_android_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "ui/android/event_forwarder.h"
-#include "ui/android/resources/resource_factory.h"
-#include "ui/android/resources/resource_manager_impl.h"
-#include "ui/android/screen_android.h"
-#include "ui/android/view_android.h"
-#include "ui/android/window_android.h"
-
-namespace ui {
-
-static base::android::RegistrationMethod kAndroidRegisteredMethods[] = {
-    {"DisplayAndroidManager", ui::RegisterScreenAndroid},
-    {"EventForwarder", ui::RegisterEventForwarder},
-    {"ResourceFactory", ui::RegisterResourceFactory},
-    {"ResourceManager", ui::ResourceManagerImpl::RegisterResourceManager},
-    {"WindowAndroid", WindowAndroid::RegisterWindowAndroid},
-};
-
-bool RegisterUIAndroidJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kAndroidRegisteredMethods,
-                               arraysize(kAndroidRegisteredMethods));
-}
-
-}  // namespace ui

ui/android/ui_android_jni_registrar.h

-// Copyright 2014 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_ANDROID_UI_ANDROID_JNI_REGISTRAR_H_
-#define UI_ANDROID_UI_ANDROID_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/android/ui_android_export.h"
-
-namespace ui {
-
-// Register all JNI bindings necessary for chrome.
-UI_ANDROID_EXPORT bool RegisterUIAndroidJni(JNIEnv* env);
-
-}  // namespace ui
-
-#endif  // UI_ANDROID_UI_ANDROID_JNI_REGISTRAR_H_

ui/android/window_android.cc

@@ -131,10 +131,6 @@ ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(java_window_);
 }
 
-bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 WindowAndroid::~WindowAndroid() {
   DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view.";
   DCHECK(!compositor_);

ui/android/window_android.h

@@ -44,8 +44,6 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
-  static bool RegisterWindowAndroid(JNIEnv* env);
-
   // Compositor callback relay.
   void OnCompositingDidCommit();
 

ui/base/BUILD.gn

@@ -67,8 +67,6 @@ component("base") {
     "accelerators/platform_accelerator.h",
     "accelerators/platform_accelerator_cocoa.h",
     "accelerators/platform_accelerator_cocoa.mm",
-    "android/ui_base_jni_registrar.cc",
-    "android/ui_base_jni_registrar.h",
     "class_property.cc",
     "class_property.h",
     "clipboard/clipboard_android.cc",

ui/base/android/ui_base_jni_registrar.cc

-// Copyright 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/base/android/ui_base_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "ui/base/clipboard/clipboard_android.h"
-#include "ui/base/l10n/l10n_util_android.h"
-
-namespace ui {
-namespace android {
-
-static base::android::RegistrationMethod kUiRegisteredMethods[] = {
-    {"LocalizationUtils", l10n_util::RegisterLocalizationUtil},
-    {"ClipboardAndroid", ui::RegisterClipboardAndroid},
-};
-
-bool RegisterJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kUiRegisteredMethods,
-                               arraysize(kUiRegisteredMethods));
-}
-
-}  // namespace android
-}  // namespace ui

ui/base/android/ui_base_jni_registrar.h

-// Copyright 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_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_
-#define UI_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/base/ui_base_export.h"
-
-namespace ui {
-namespace android {
-
-// Register all JNI bindings necessary for chrome.
-UI_BASE_EXPORT bool RegisterJni(JNIEnv* env);
-
-}  // namespace android
-}  // namespace ui
-
-#endif  // UI_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_

ui/base/clipboard/clipboard_android.cc

@@ -550,10 +550,6 @@ void ClipboardAndroid::WriteData(const Clipboard::FormatType& format,
   g_map.Get().Set(format.ToString(), std::string(data_data, data_len));
 }
 
-bool RegisterClipboardAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 // Returns a pointer to the current ClipboardAndroid object.
 static jlong Init(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& obj) {

ui/base/clipboard/clipboard_android.h

@@ -87,9 +87,6 @@ class ClipboardAndroid : public Clipboard {
   DISALLOW_COPY_AND_ASSIGN(ClipboardAndroid);
 };
 
-// Registers the ClipboardAndroid native method.
-bool RegisterClipboardAndroid(JNIEnv* env);
-
 }  // namespace ui
 
 #endif  // UI_BASE_CLIPBOARD_CLIPBOARD_ANDROID_H_

ui/base/l10n/l10n_util_android.cc

@@ -108,8 +108,4 @@ ScopedJavaLocalRef<jstring> GetDurationString(JNIEnv* env,
   return jtime_remaining;
 }
 
-bool RegisterLocalizationUtil(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace l10n_util

ui/base/l10n/l10n_util_android.h

@@ -20,8 +20,6 @@ UI_BASE_EXPORT base::string16 GetDisplayNameForLocale(
 
 UI_BASE_EXPORT bool IsLayoutRtl();
 
-UI_BASE_EXPORT bool RegisterLocalizationUtil(JNIEnv* env);
-
 }  // namespace l10n_util
 
 #endif  // UI_BASE_L10N_L10N_UTIL_ANDROID_H_

ui/base/test/run_all_unittests.cc

@@ -13,12 +13,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "ui/base/android/ui_base_jni_registrar.h"
-#include "ui/gfx/android/gfx_jni_registrar.h"
-#endif
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/bundle_locations.h"
 #include "base/test/mock_chrome_application_mac.h"
@@ -53,12 +47,6 @@ void UIBaseTestSuite::Initialize() {
   display::win::SetDefaultDeviceScaleFactor(1.0);
 #endif
 
-#if defined(OS_ANDROID)
-  // Register JNI bindings for android.
-  gfx::android::RegisterJni(base::android::AttachCurrentThread());
-  ui::android::RegisterJni(base::android::AttachCurrentThread());
-#endif
-
   ui::RegisterPathProvider();
 
   base::FilePath exe_path;

ui/events/devices/input_device_observer_android.cc

@@ -19,10 +19,6 @@ using base::android::JavaParamRef;
 
 namespace ui {
 
-bool InputDeviceObserverAndroid::RegisterInputDeviceObserver(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 InputDeviceObserverAndroid::InputDeviceObserverAndroid() {}
 
 InputDeviceObserverAndroid::~InputDeviceObserverAndroid() {}
@@ -64,4 +60,4 @@ NOTIFY_OBSERVERS(NotifyObserversTouchpadDeviceConfigurationChanged(),
 NOTIFY_OBSERVERS(NotifyObserversKeyboardDeviceConfigurationChanged(),
                  OnKeyboardDeviceConfigurationChanged());
 
-}  // namespace ui
\ No newline at end of file
+}  // namespace ui

ui/events/devices/input_device_observer_android.h

@@ -25,8 +25,6 @@ class EVENTS_DEVICES_EXPORT InputDeviceObserverAndroid {
   static InputDeviceObserverAndroid* GetInstance();
   ~InputDeviceObserverAndroid();
 
-  static bool RegisterInputDeviceObserver(JNIEnv* env);
-
   void AddObserver(ui::InputDeviceEventObserver* observer);
   void RemoveObserver(ui::InputDeviceEventObserver* observer);
 

ui/gfx/BUILD.gn

@@ -44,8 +44,6 @@ component("geometry_skia") {
 
 component("gfx") {
   sources = [
-    "android/gfx_jni_registrar.cc",
-    "android/gfx_jni_registrar.h",
     "android/java_bitmap.cc",
     "android/java_bitmap.h",
     "android/view_configuration.cc",

ui/gfx/android/gfx_jni_registrar.cc

-// 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 "base/macros.h"
-#include "ui/gfx/android/view_configuration.h"
-
-namespace gfx {
-namespace android {
-
-static base::android::RegistrationMethod kGfxRegisteredMethods[] = {
-  { "ViewConfiguration", ViewConfiguration::RegisterViewConfiguration }
-};
-
-bool RegisterJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kGfxRegisteredMethods,
-                               arraysize(kGfxRegisteredMethods));
-}
-
-}  // namespace android
-}  // namespace gfx

ui/gfx/android/gfx_jni_registrar.h

-// 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_

ui/gfx/android/view_configuration.cc

@@ -175,8 +175,4 @@ int ViewConfiguration::GetMinScalingSpanInDips() {
   return g_view_configuration.Get().min_scaling_span_in_dips();
 }
 
-bool ViewConfiguration::RegisterViewConfiguration(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace gfx

ui/gfx/android/view_configuration.h

@@ -26,9 +26,6 @@ class GFX_EXPORT ViewConfiguration {
   static int GetDoubleTapSlopInDips();
 
   static int GetMinScalingSpanInDips();
-
-  // Registers methods with JNI and returns true if succeeded.
-  static bool RegisterViewConfiguration(JNIEnv* env);
 };
 
 }  // namespace gfx

ui/gfx/test/run_all_unittests.cc

@@ -13,11 +13,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "ui/gfx/android/gfx_jni_registrar.h"
-#endif
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/test/mock_chrome_application_mac.h"
 #endif
@@ -46,10 +41,6 @@ class GfxTestSuite : public base::TestSuite {
   void Initialize() override {
     base::TestSuite::Initialize();
 
-#if defined(OS_ANDROID)
-    gfx::android::RegisterJni(base::android::AttachCurrentThread());
-#endif
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
     mock_cr_app::RegisterMockCrApp();
 #endif

ui/gl/BUILD.gn

@@ -45,8 +45,6 @@ component("gl") {
   output_name = "gl_wrapper"  # Avoid colliding with OS X"s libGL.dylib.
 
   sources = [
-    "android/gl_jni_registrar.cc",
-    "android/gl_jni_registrar.h",
     "android/scoped_java_surface.cc",
     "android/scoped_java_surface.h",
     "android/surface_texture.cc",

ui/gl/android/gl_jni_registrar.cc

-// 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/gl/android/gl_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "ui/gl/android/surface_texture_listener.h"
-
-namespace ui {
-namespace gl {
-namespace android {
-
-static base::android::RegistrationMethod kGLRegisteredMethods[] = {
-    {"SurfaceTextureListener",
-     ::gl::SurfaceTextureListener::RegisterSurfaceTextureListener},
-};
-
-bool RegisterJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kGLRegisteredMethods,
-                               arraysize(kGLRegisteredMethods));
-}
-
-}  // namespace android
-}  // namespace gl
-}  // namespace ui

ui/gl/android/gl_jni_registrar.h

-// 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_GL_ANDROID_GL_JNI_REGISTRAR_H_
-#define UI_GL_ANDROID_GL_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/gl/gl_export.h"
-
-namespace ui {
-namespace gl {
-namespace android {
-
-// Register all JNI bindings necessary for chrome.
-GL_EXPORT bool RegisterJni(JNIEnv* env);
-
-}  // namespace android
-}  // namespace gl
-}  // namespace ui
-
-#endif  // UI_GL_ANDROID_GL_JNI_REGISTRAR_H_

ui/gl/android/surface_texture_listener.cc

@@ -38,9 +38,4 @@ void SurfaceTextureListener::FrameAvailable(JNIEnv* env,
   }
 }
 
-// static
-bool SurfaceTextureListener::RegisterSurfaceTextureListener(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace gl

ui/gl/android/surface_texture_listener.h

@@ -30,8 +30,6 @@ class GL_EXPORT SurfaceTextureListener {
   void FrameAvailable(JNIEnv* env,
                       const base::android::JavaParamRef<jobject>& obj);
 
-  static bool RegisterSurfaceTextureListener(JNIEnv* env);
-
  private:
   friend class base::DeleteHelper<SurfaceTextureListener>;
 

ui/platform_window/android/platform_ime_controller_android.cc

@@ -13,11 +13,6 @@ using base::android::ScopedJavaLocalRef;
 
 namespace ui {
 
-// static
-bool PlatformImeControllerAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 PlatformImeControllerAndroid::PlatformImeControllerAndroid() {
 }
 

ui/platform_window/android/platform_ime_controller_android.h

@@ -15,8 +15,6 @@ namespace ui {
 class ANDROID_WINDOW_EXPORT PlatformImeControllerAndroid :
     public PlatformImeController {
  public:
-  static bool Register(JNIEnv* env);
-
   PlatformImeControllerAndroid();
   ~PlatformImeControllerAndroid() override;
 

ui/platform_window/android/platform_window_android.cc

@@ -49,11 +49,6 @@ ui::EventType MotionEventActionToEventType(jint action) {
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformWindowAndroid, public:
 
-// static
-bool PlatformWindowAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 PlatformWindowAndroid::PlatformWindowAndroid(PlatformWindowDelegate* delegate)
     : delegate_(delegate),
       window_(NULL),

ui/platform_window/android/platform_window_android.h

@@ -24,8 +24,6 @@ class PlatformWindowDelegate;
 
 class ANDROID_WINDOW_EXPORT PlatformWindowAndroid : public PlatformWindow {
  public:
-  static bool Register(JNIEnv* env);
-
   explicit PlatformWindowAndroid(PlatformWindowDelegate* delegate);
   ~PlatformWindowAndroid() override;
 

ui/shell_dialogs/BUILD.gn

@@ -51,8 +51,6 @@ component("shell_dialogs") {
 
   if (is_android && !use_aura) {
     sources += [
-      "android/shell_dialogs_jni_registrar.cc",
-      "android/shell_dialogs_jni_registrar.h",
       "select_file_dialog_android.cc",
       "select_file_dialog_android.h",
     ]

ui/shell_dialogs/android/shell_dialogs_jni_registrar.cc

-// 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/shell_dialogs/android/shell_dialogs_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "ui/shell_dialogs/select_file_dialog_android.h"
-
-namespace ui {
-namespace shell_dialogs {
-
-static base::android::RegistrationMethod kUiRegisteredMethods[] = {
-  { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog },
-};
-
-bool RegisterJni(JNIEnv* env) {
-  return RegisterNativeMethods(env, kUiRegisteredMethods,
-                               arraysize(kUiRegisteredMethods));
-}
-
-}  // namespace shell_dialogs
-}  // namespace ui

ui/shell_dialogs/android/shell_dialogs_jni_registrar.h

-// 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_SHELL_DIALOGS_ANDROID_UI_SHELL_DIALOGS_JNI_REGISTRAR_H_
-#define UI_SHELL_DIALOGS_ANDROID_UI_SHELL_DIALOGS_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/shell_dialogs/shell_dialogs_export.h"
-
-namespace ui {
-namespace shell_dialogs {
-
-// Register all JNI bindings necessary for chrome.
-SHELL_DIALOGS_EXPORT bool RegisterJni(JNIEnv* env);
-
-}  // namespace shell_dialogs
-}  // namespace ui
-
-#endif  // UI_SHELL_DIALOGS_ANDROID_UI_SHELL_DIALOGS_JNI_REGISTRAR_H_

ui/shell_dialogs/select_file_dialog_android.cc

@@ -125,10 +125,6 @@ void SelectFileDialogImpl::SelectFileImpl(
                                    owning_window->GetJavaObject());
 }
 
-bool SelectFileDialogImpl::RegisterSelectFileDialog(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 SelectFileDialogImpl::~SelectFileDialogImpl() {
 }
 

ui/shell_dialogs/select_file_dialog_android.h

@@ -50,8 +50,6 @@ class SelectFileDialogImpl : public SelectFileDialog {
                       gfx::NativeWindow owning_window,
                       void* params) override;
 
-  static bool RegisterSelectFileDialog(JNIEnv* env);
-
  protected:
   ~SelectFileDialogImpl() override;