Delete JNI registration calls in chrome/browser/ui

This CL deletes all JNI registration calls under chrome/browser/ui since
the JNI registration is automatic now.

Change-Id: Id3a0bf6fe0d3bdc413e878324b732979ce0536fc
Reviewed-on: https://chromium-review.googlesource.com/572189Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Yipeng Wang <yipengw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487074}

chrome/browser/android/chrome_jni_registrar.cc

@@ -145,35 +145,6 @@
 #include "chrome/browser/supervised_user/supervised_user_content_provider_android.h"
 #include "chrome/browser/sync/profile_sync_service_android.h"
 #include "chrome/browser/sync/sessions/sync_sessions_metrics_android.h"
-#include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h"
-#include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
-#include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
-#include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
-#include "chrome/browser/ui/android/autofill/password_generation_popup_view_android.h"
-#include "chrome/browser/ui/android/bluetooth_chooser_android.h"
-#include "chrome/browser/ui/android/chrome_http_auth_handler.h"
-#include "chrome/browser/ui/android/context_menu_helper.h"
-#include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
-#include "chrome/browser/ui/android/infobars/autofill_save_card_infobar.h"
-#include "chrome/browser/ui/android/infobars/infobar_android.h"
-#include "chrome/browser/ui/android/infobars/infobar_container_android.h"
-#include "chrome/browser/ui/android/infobars/reader_mode_infobar.h"
-#include "chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.h"
-#include "chrome/browser/ui/android/infobars/translate_compact_infobar.h"
-#include "chrome/browser/ui/android/infobars/translate_infobar.h"
-#include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
-#include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
-#include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
-#include "chrome/browser/ui/android/page_info/certificate_chain_helper.h"
-#include "chrome/browser/ui/android/page_info/certificate_viewer_android.h"
-#include "chrome/browser/ui/android/page_info/connection_info_popup_android.h"
-#include "chrome/browser/ui/android/page_info/page_info_popup_android.h"
-#include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h"
-#include "chrome/browser/ui/android/ssl_client_certificate_request.h"
-#include "chrome/browser/ui/android/tab_model/single_tab_model.h"
-#include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
-#include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
-#include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
 #include "components/feature_engagement_tracker/public/android/feature_engagement_tracker_jni_registrar.h"
 #include "components/offline_pages/features/features.h"
 #include "components/safe_browsing_db/android/jni_registrar.h"
@@ -207,44 +178,30 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
      banners::RegisterAppBannerInfoBarDelegateAndroid},
     {"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register},
     {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid},
-    {"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register},
-    {"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView::
-                                      RegisterAutofillKeyboardAccessoryView},
-    {"AutofillPopup",
-     autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
     {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
     {"BackgroundSchedulerBridge",
      offline_pages::android::RegisterBackgroundSchedulerBridge},
     {"PrefetchBackgroundTask", offline_pages::RegisterPrefetchBackgroundTask},
-    {"BluetoothChooserAndroid", BluetoothChooserAndroid::Register},
     {"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge},
     {"BrowsingDataBridge", RegisterBrowsingDataBridge},
     {"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register},
     {"BrowsingHistoryBridge", RegisterBrowsingHistoryBridge},
-    {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
-    {"CertificateViewer", RegisterCertificateViewer},
-    {"CertificateChainHelper", RegisterCertificateChainHelper},
     {"ChildAccountService", RegisterChildAccountService},
     {"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},
     {"ChromeBackupAgent", chrome::android::RegisterBackupAgent},
     {"ChromeBrowserProvider",
      ChromeBrowserProvider::RegisterChromeBrowserProvider},
     {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni},
-    {"ChromeHttpAuthHandler",
-     ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
     {"ChromeMediaRouter", media_router::MediaRouterAndroidBridge::Register},
     {"ChromeMediaRouterDialogController",
      media_router::MediaRouterDialogControllerAndroid::Register},
     {"ChromePayments", payments::android::RegisterChromePayments},
     {"ChromeWebApkHost", ChromeWebApkHost::Register},
     {"CompositorView", RegisterCompositorView},
-    {"ConnectionInfoPopupAndroid",
-     ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
     {"SecurityStateModel", RegisterSecurityStateModelAndroid},
     {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker},
     {"ContentSuggestionsNotificationHelper",
      ntp_snippets::ContentSuggestionsNotificationHelper::Register},
-    {"ContextMenuHelper", RegisterContextMenuHelper},
     {"ContextualSearchContext", RegisterContextualSearchContext},
     {"ContextualSearchManager", RegisterContextualSearchManager},
     {"ContextualSearchRankerLoggerImpl",
@@ -252,8 +209,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer},
     {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper},
     {"CookiesFetcher", RegisterCookiesFetcher},
-    {"CreditCardScannerBridge",
-     autofill::CreditCardScannerViewAndroid::Register},
     {"CtrSuppression", RegisterCtrSuppression},
     {"DataReductionPromoInfoBarDelegate",
      DataReductionPromoInfoBarDelegateAndroid::Register},
@@ -286,13 +241,10 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"ForeignSessionHelper",
      ForeignSessionHelper::RegisterForeignSessionHelper},
     {"HistoryReportJniBridge", history_report::RegisterHistoryReportJniBridge},
-    {"InfoBarContainer", RegisterInfoBarContainer},
     {"InstantAppsInfobarDelegate", RegisterInstantAppsInfoBarDelegate},
     {"InstantAppsSettings", RegisterInstantAppsSettings},
     {"InvalidationServiceFactory",
      invalidation::InvalidationServiceFactoryAndroid::Register},
-    {"JavascriptAppModalDialog",
-     JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog},
     {"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge},
     {"LaunchMetrics", metrics::RegisterLaunchMetrics},
     {"LayerTitleCache", RegisterLayerTitleCache},
@@ -303,7 +255,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"MediaDrmCredentialManager",
      MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},
     {"MostVisitedSitesBridge", MostVisitedSitesBridge::Register},
-    {"NativeInfoBar", RegisterNativeInfoBar},
     {"ExternalEstimateProviderAndroid",
      chrome::android::RegisterExternalEstimateProviderAndroid},
     {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni},
@@ -320,15 +271,10 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
      offline_pages::android::OfflinePageEvaluationBridge::Register},
 #endif
     {"OmniboxPrerender", RegisterOmniboxPrerender},
-    {"OmniboxUrlEmphasizer",
-     OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
-    {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
     {"OriginVerifier", customtabs::RegisterOriginVerifier},
     {"OverlayPanelContent", RegisterOverlayPanelContent},
     {"PartnerBookmarksReader",
      PartnerBookmarksReader::RegisterPartnerBookmarksReader},
-    {"PasswordGenerationPopup",
-     autofill::PasswordGenerationPopupViewAndroid::Register},
     {"PasswordUIViewAndroid",
      PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
     {"PermissionDialogDelegate",
@@ -348,7 +294,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"RapporServiceBridge", rappor::RegisterRapporServiceBridge},
     {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
     {"RecordCastAction", remote_media::RegisterRecordCastAction},
-    {"ReaderModeInfoBar", RegisterReaderModeInfoBar},
     {"RemoteMediaPlayerBridge",
      remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
     {"ResourceFactory", RegisterResourceFactory},
@@ -365,16 +310,12 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper},
     {"SigninInvestigator", SigninInvestigatorAndroid::Register},
     {"SigninManager", SigninManagerAndroid::Register},
-    {"SimpleConfirmInfoBarBuilder", RegisterSimpleConfirmInfoBarBuilder},
-    {"SingleTabModel", RegisterSingleTabModel},
     {"SiteEngagementService", SiteEngagementServiceAndroid::Register},
     {"SpecialLocaleHandler", RegisterSpecialLocaleHandler},
 #if BUILDFLAG(ENABLE_SPELLCHECK)
     {"SpellCheckerSessionBridge", spellcheck::android::RegisterSpellcheckJni},
 #endif
     {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
-    {"SSLClientCertificateRequest",
-     chrome::android::RegisterSSLClientCertificateRequestAndroid},
     {"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils},
     {"StaticTabSceneLayer", RegisterStaticTabSceneLayer},
     {"SuggestionsEventReporterBridge", RegisterSuggestionsEventReporterBridge},
@@ -384,21 +325,16 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"TabAndroid", TabAndroid::RegisterTabAndroid},
     {"TabContentManager", RegisterTabContentManager},
     {"TabListSceneLayer", RegisterTabListSceneLayer},
-    {"TabModelJniBridge", TabModelJniBridge::Register},
     {"TabState", RegisterTabState},
     {"TabStripSceneLayer", RegisterTabStripSceneLayer},
     {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
     {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
     {"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider},
-    {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
     {"ToolbarSceneLayer", RegisterToolbarSceneLayer},
-    {"TranslateCompactInfoBar", RegisterTranslateCompactInfoBar},
-    {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
     {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
     {"UmaSessionStats", RegisterUmaSessionStats},
     {"UrlFilterBridge", UrlFilterBridge::Register},
     {"UrlUtilities", RegisterUrlUtilities},
-    {"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register},
     {"Variations", variations::android::RegisterVariations},
     {"VariationsSession", chrome::android::RegisterVariationsSession},
     {"WarmupManager", RegisterWarmupManager},
@@ -407,8 +343,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
     {"WebApkUpdateDataFetcher", WebApkUpdateDataFetcher::Register},
     {"WebContentsFactory", RegisterWebContentsFactory},
     {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
-    {"PageInfoPopupAndroid",
-     PageInfoPopupAndroid::RegisterPageInfoPopupAndroid},
 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
     {"PrintingContext",
      printing::PrintingContextAndroid::RegisterPrintingContext},

chrome/browser/ui/BUILD.gn

@@ -2328,7 +2328,6 @@ split_static_library("ui") {
       "android/infobars/search_geolocation_disclosure_infobar.cc",
       "android/infobars/search_geolocation_disclosure_infobar.h",
       "android/infobars/simple_confirm_infobar_builder.cc",
-      "android/infobars/simple_confirm_infobar_builder.h",
       "android/infobars/translate_compact_infobar.cc",
       "android/infobars/translate_compact_infobar.h",
       "android/infobars/translate_infobar.cc",
@@ -2343,9 +2342,7 @@ split_static_library("ui") {
       "android/omnibox/omnibox_view_util.cc",
       "android/omnibox/omnibox_view_util.h",
       "android/page_info/certificate_chain_helper.cc",
-      "android/page_info/certificate_chain_helper.h",
       "android/page_info/certificate_viewer_android.cc",
-      "android/page_info/certificate_viewer_android.h",
       "android/page_info/connection_info_popup_android.cc",
       "android/page_info/connection_info_popup_android.h",
       "android/page_info/page_info_popup_android.cc",
@@ -2354,13 +2351,11 @@ split_static_library("ui") {
       "android/snackbars/auto_signin_prompt_controller.cc",
       "android/snackbars/auto_signin_prompt_controller.h",
       "android/ssl_client_certificate_request.cc",
-      "android/ssl_client_certificate_request.h",
       "android/tab_contents/chrome_web_contents_view_delegate_android.cc",
       "android/tab_contents/chrome_web_contents_view_delegate_android.h",
       "android/tab_model/android_live_tab_context.cc",
       "android/tab_model/android_live_tab_context.h",
       "android/tab_model/single_tab_model.cc",
-      "android/tab_model/single_tab_model.h",
       "android/tab_model/tab_model.cc",
       "android/tab_model/tab_model.h",
       "android/tab_model/tab_model_jni_bridge.cc",

chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc

@@ -174,10 +174,4 @@ void AutofillKeyboardAccessoryView::ViewDismissed(
   delete this;
 }
 
-// static
-bool AutofillKeyboardAccessoryView::RegisterAutofillKeyboardAccessoryView(
-    JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace autofill

chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h

@@ -45,8 +45,6 @@ class AutofillKeyboardAccessoryView : public AutofillPopupView {
   void ViewDismissed(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& obj);
 
-  static bool RegisterAutofillKeyboardAccessoryView(JNIEnv* env);
-
  protected:
   // AutofillPopupView implementation.
   void Show() override;

chrome/browser/ui/android/autofill/autofill_popup_view_android.cc

@@ -175,11 +175,6 @@ void AutofillPopupViewAndroid::PopupDismissed(
   delete this;
 }
 
-// static
-bool AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {

chrome/browser/ui/android/autofill/autofill_popup_view_android.h

@@ -40,8 +40,6 @@ class AutofillPopupViewAndroid : public AutofillPopupView {
   void PopupDismissed(JNIEnv* env,
                       const base::android::JavaParamRef<jobject>& obj);
 
-  static bool RegisterAutofillPopupViewAndroid(JNIEnv* env);
-
  protected:
   // AutofillPopupView implementation.
   void Show() override;

chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

@@ -128,9 +128,4 @@ void CardUnmaskPromptViewAndroid::GotVerificationResult(
                                              allow_retry);
 }
 
-// static
-bool CardUnmaskPromptViewAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace autofill

chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h

@@ -50,8 +50,6 @@ class CardUnmaskPromptViewAndroid : public CardUnmaskPromptView {
   void GotVerificationResult(const base::string16& error_message,
                              bool allow_retry) override;
 
-  static bool Register(JNIEnv* env);
-
  private:
   ~CardUnmaskPromptViewAndroid() override;
 

chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc

@@ -39,11 +39,6 @@ std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create(
       new CreditCardScannerViewAndroid(delegate, web_contents));
 }
 
-// static
-bool CreditCardScannerViewAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 CreditCardScannerViewAndroid::CreditCardScannerViewAndroid(
     const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
     content::WebContents* web_contents)

chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h

@@ -24,9 +24,6 @@ class CreditCardScannerViewDelegate;
 // APIs through JNI service.
 class CreditCardScannerViewAndroid : public CreditCardScannerView {
  public:
-  // Registers with JNI services.
-  static bool Register(JNIEnv* env);
-
   CreditCardScannerViewAndroid(
       const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
       content::WebContents* web_contents);

chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc

@@ -50,11 +50,6 @@ void PasswordGenerationPopupViewAndroid::PasswordSelected(
     controller_->PasswordAccepted();
 }
 
-// static
-bool PasswordGenerationPopupViewAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 PasswordGenerationPopupViewAndroid::~PasswordGenerationPopupViewAndroid() {}
 
 void PasswordGenerationPopupViewAndroid::Show() {

chrome/browser/ui/android/autofill/password_generation_popup_view_android.h

@@ -36,9 +36,6 @@ class PasswordGenerationPopupViewAndroid : public PasswordGenerationPopupView {
   void PasswordSelected(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& object);
 
-  // Registers the popup with JNI.
-  static bool Register(JNIEnv* env);
-
  private:
   // The popup owns itself.
   virtual ~PasswordGenerationPopupViewAndroid();

chrome/browser/ui/android/bluetooth_chooser_android.cc

@@ -159,11 +159,6 @@ void BluetoothChooserAndroid::ShowNeedLocationPermissionLink(
   event_handler_.Run(Event::SHOW_NEED_LOCATION_HELP, "");
 }
 
-// static
-bool BluetoothChooserAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 void BluetoothChooserAndroid::OpenURL(const char* url) {
   web_contents_->OpenURL(content::OpenURLParams(
       GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,

chrome/browser/ui/android/bluetooth_chooser_android.h

@@ -50,8 +50,6 @@ class BluetoothChooserAndroid : public content::BluetoothChooser {
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
-  static bool Register(JNIEnv* env);
-
  private:
   void OpenURL(const char* url);
   base::android::ScopedJavaGlobalRef<jobject> java_dialog_;

chrome/browser/ui/android/chrome_http_auth_handler.cc

@@ -82,8 +82,3 @@ ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody(
   return ConvertUTF16ToJavaString(
       env, authority_ + base::ASCIIToUTF16(" ") + explanation_);
 }
-
-// static
-bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/chrome_http_auth_handler.h

@@ -55,8 +55,6 @@ class ChromeHttpAuthHandler {
   base::android::ScopedJavaLocalRef<jstring> GetMessageBody(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>&);
-  // Registers the ChromeHttpAuthHandler native methods.
-  static bool RegisterChromeHttpAuthHandler(JNIEnv* env);
  private:
   LoginHandler* observer_;
   base::android::ScopedJavaGlobalRef<jobject> java_chrome_http_auth_handler_;

chrome/browser/ui/android/context_menu_helper.cc

@@ -228,7 +228,3 @@ void ContextMenuHelper::RetrieveImageInternal(
       base::Bind(retrieve_callback, base::Passed(&thumbnail_capturer),
                  base::android::ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
-
-bool RegisterContextMenuHelper(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/context_menu_helper.h

@@ -85,6 +85,4 @@ class ContextMenuHelper
   DISALLOW_COPY_AND_ASSIGN(ContextMenuHelper);
 };
 
-bool RegisterContextMenuHelper(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_CONTEXT_MENU_HELPER_H_

chrome/browser/ui/android/infobars/autofill_save_card_infobar.cc

@@ -43,11 +43,6 @@ void AutofillSaveCardInfoBar::OnLegalMessageLinkClicked(JNIEnv* env,
       GURL(base::android::ConvertJavaStringToUTF16(env, url)));
 }
 
-// static
-bool AutofillSaveCardInfoBar::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 base::android::ScopedJavaLocalRef<jobject>
 AutofillSaveCardInfoBar::CreateRenderInfoBar(JNIEnv* env) {
   autofill::AutofillSaveCardInfoBarDelegateMobile* delegate =

chrome/browser/ui/android/infobars/autofill_save_card_infobar.h

@@ -27,9 +27,6 @@ class AutofillSaveCardInfoBar : public ConfirmInfoBar {
   // Called when a link in the legal message text was clicked.
   void OnLegalMessageLinkClicked(JNIEnv* env, jobject obj, jstring url);
 
-  // Registers the JNI bindings.
-  static bool Register(JNIEnv* env);
-
  private:
   // ConfirmInfoBar:
   base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(

chrome/browser/ui/android/infobars/infobar_android.cc

@@ -84,10 +84,3 @@ void InfoBarAndroid::CloseJavaInfoBar() {
 int InfoBarAndroid::GetEnumeratedIconId() {
   return ResourceMapper::MapFromChromiumId(delegate()->GetIconId());
 }
-
-
-// Native JNI methods ---------------------------------------------------------
-
-bool RegisterNativeInfoBar(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/infobar_android.h

@@ -81,7 +81,4 @@ class InfoBarAndroid : public infobars::InfoBar {
   DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid);
 };
 
-// Registers the NativeInfoBar's native methods through JNI.
-bool RegisterNativeInfoBar(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_ANDROID_H_

chrome/browser/ui/android/infobars/infobar_container_android.cc

@@ -109,7 +109,3 @@ static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
       new InfoBarContainerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(infobar_container);
 }
-
-bool RegisterInfoBarContainer(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/infobar_container_android.h

@@ -52,7 +52,4 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer {
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainerAndroid);
 };
 
-// Registers the InfoBarContainer's native methods through JNI.
-bool RegisterInfoBarContainer(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_INFOBAR_CONTAINER_ANDROID_H_

chrome/browser/ui/android/infobars/reader_mode_infobar.cc

@@ -66,7 +66,3 @@ void Create(JNIEnv* env,
   service->AddInfoBar(base::MakeUnique<ReaderModeInfoBar>(
       base::MakeUnique<ReaderModeInfoBarDelegate>()));
 }
-
-bool RegisterReaderModeInfoBar(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/reader_mode_infobar.h

@@ -35,7 +35,4 @@ class ReaderModeInfoBar : public InfoBarAndroid {
   DISALLOW_COPY_AND_ASSIGN(ReaderModeInfoBar);
 };
 
-// Register native methods.
-bool RegisterReaderModeInfoBar(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_READER_MODE_INFOBAR_H_

chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.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 "chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.h"
-
 #include <memory>
 
 #include "base/android/jni_android.h"
@@ -164,7 +162,3 @@ void Create(JNIEnv* env,
           j_listener, infobar_identifier, icon_bitmap, message_str, primary_str,
           secondary_str, auto_expire)));
 }
-
-bool RegisterSimpleConfirmInfoBarBuilder(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.h

-// Copyright 2016 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 CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_
-#define CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_
-
-#include "base/android/jni_android.h"
-
-// Registers native methods.
-bool RegisterSimpleConfirmInfoBarBuilder(JNIEnv* env);
-
-#endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_SIMPLE_CONFIRM_INFOBAR_BUILDER_H_

chrome/browser/ui/android/infobars/translate_compact_infobar.cc

@@ -207,10 +207,3 @@ bool TranslateCompactInfoBar::IsDeclinedByUser() {
   // Whether there is any affirmative action bit.
   return action_flags_ == FLAG_NONE;
 }
-
-// Native JNI methods ---------------------------------------------------------
-
-// static
-bool RegisterTranslateCompactInfoBar(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/translate_compact_infobar.h

@@ -93,7 +93,4 @@ class TranslateCompactInfoBar
   DISALLOW_COPY_AND_ASSIGN(TranslateCompactInfoBar);
 };
 
-// Registers the native methods through JNI.
-bool RegisterTranslateCompactInfoBar(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_COMPACT_INFOBAR_H_

chrome/browser/ui/android/infobars/translate_infobar.cc

@@ -158,10 +158,3 @@ bool TranslateInfoBar::ShouldDisplayNeverTranslateInfoBarOnCancel() {
 translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
   return delegate()->AsTranslateInfoBarDelegate();
 }
-
-
-// Native JNI methods ---------------------------------------------------------
-
-bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/infobars/translate_infobar.h

@@ -47,8 +47,4 @@ class TranslateInfoBar : public InfoBarAndroid {
 
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBar);
 };
-
-// Registers the native methods through JNI.
-bool RegisterTranslateInfoBarDelegate(JNIEnv* env);
-
 #endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_INFOBAR_H_

chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

@@ -162,12 +162,6 @@ ScopedJavaLocalRef<jobject> GetCurrentModalDialog(
   return ScopedJavaLocalRef<jobject>(js_dialog->GetDialogObject());
 }
 
-// static
-bool JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog(
-    JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() {
   // In case the dialog is still displaying, tell it to close itself.
   // This can happen if you trigger a dialog but close the Tab before it's

chrome/browser/ui/android/javascript_app_modal_dialog_android.h

@@ -45,8 +45,6 @@ class JavascriptAppModalDialogAndroid
 
   const base::android::ScopedJavaGlobalRef<jobject>& GetDialogObject() const;
 
-  static bool RegisterJavascriptAppModalDialog(JNIEnv* env);
-
  private:
   // The object deletes itself.
   ~JavascriptAppModalDialogAndroid() override;

chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc

@@ -32,8 +32,3 @@ ScopedJavaLocalRef<jintArray> ParseForEmphasizeComponents(
   int emphasize_values[] = {scheme.begin, scheme.len, host.begin, host.len};
   return base::android::ToJavaIntArray(env, emphasize_values, 4);
 }
-
-// static
-bool OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h

@@ -11,9 +11,6 @@
 
 // Helper functions for the Omnibox URL emphasizer on Android.
 class OmniboxUrlEmphasizer {
- public:
-  static bool RegisterOmniboxUrlEmphasizer(JNIEnv* env);
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxUrlEmphasizer);
 };

chrome/browser/ui/android/omnibox/omnibox_view_util.cc

@@ -21,8 +21,3 @@ ScopedJavaLocalRef<jstring> SanitizeTextForPaste(
   pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text);
   return base::android::ConvertUTF16ToJavaString(env, pasted_text);
 }
-
-// static
-bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/omnibox/omnibox_view_util.h

@@ -11,9 +11,6 @@
 
 // Helper functions for the Omnibox view on Android.
 class OmniboxViewUtil {
- public:
-  static bool RegisterOmniboxViewUtil(JNIEnv* env);
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxViewUtil);
 };

chrome/browser/ui/android/page_info/certificate_chain_helper.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 "chrome/browser/ui/android/page_info/certificate_chain_helper.h"
-
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -50,8 +48,3 @@ static ScopedJavaLocalRef<jobjectArray> GetCertificateChain(
 
   return base::android::ToJavaArrayOfByteArray(env, cert_chain);
 }
-
-// static
-bool RegisterCertificateChainHelper(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/page_info/certificate_chain_helper.h

-// Copyright 2016 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 CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_
-#define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_
-
-#include <jni.h>
-
-bool RegisterCertificateChainHelper(JNIEnv* env);
-
-#endif // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_CHAIN_HELPER_H_

chrome/browser/ui/android/page_info/certificate_viewer_android.cc

@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/android/page_info/certificate_viewer_android.h"
-
 #include "base/android/jni_string.h"
 #include "base/logging.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/grit/generated_resources.h"
 #include "jni/CertificateViewer_jni.h"
 #include "net/cert/x509_certificate.h"
@@ -105,7 +104,3 @@ static ScopedJavaLocalRef<jstring> GetCertSHA1FingerprintText(
   return ConvertUTF8ToJavaString(
       env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL));
 }
-
-bool RegisterCertificateViewer(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/page_info/certificate_viewer_android.h

-// Copyright 2015 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 CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_
-#define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_
-
-#include "chrome/browser/certificate_viewer.h"
-
-#include <jni.h>
-
-bool RegisterCertificateViewer(JNIEnv* env);
-
-#endif  // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_CERTIFICATE_VIEWER_ANDROID_H_

chrome/browser/ui/android/page_info/connection_info_popup_android.cc

@@ -153,10 +153,3 @@ void ConnectionInfoPopupAndroid::SetPermissionInfo(
     ChosenObjectInfoList chosen_object_info_list) {
   NOTIMPLEMENTED();
 }
-
-// static
-bool
-ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid(
-    JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/page_info/connection_info_popup_android.h

@@ -40,8 +40,6 @@ class ConnectionInfoPopupAndroid : public PageInfoUI {
                          ChosenObjectInfoList chosen_object_info_list) override;
   void SetIdentityInfo(const IdentityInfo& identity_info) override;
 
-  static bool RegisterConnectionInfoPopupAndroid(JNIEnv* env);
-
  private:
   // The presenter that controls the Page Info UI.
   std::unique_ptr<PageInfo> presenter_;

chrome/browser/ui/android/page_info/page_info_popup_android.cc

@@ -184,8 +184,3 @@ base::Optional<ContentSetting> PageInfoPopupAndroid::GetSettingToDisplay(
   }
   return base::Optional<ContentSetting>();
 }
-
-// static
-bool PageInfoPopupAndroid::RegisterPageInfoPopupAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/page_info/page_info_popup_android.h

@@ -49,8 +49,6 @@ class PageInfoPopupAndroid : public PageInfoUI {
                          ChosenObjectInfoList chosen_object_info_list) override;
   void SetIdentityInfo(const IdentityInfo& identity_info) override;
 
-  static bool RegisterPageInfoPopupAndroid(JNIEnv* env);
-
  private:
   // Returns an optional value which is set if this permission should be
   // displayed in Page Info. Most permissions will only be displayed if they are

chrome/browser/ui/android/ssl_client_certificate_request.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 "chrome/browser/ui/android/ssl_client_certificate_request.h"
-
 #include <stddef.h>
 #include <utility>
 
@@ -178,10 +176,6 @@ static void NotifyClientCertificatesChangedOnIOThread(
   }
 }
 
-bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace android
 
 void ShowSSLClientCertificateSelector(

chrome/browser/ui/android/ssl_client_certificate_request.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 CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_
-#define CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_
-
-#include <jni.h>
-
-namespace chrome {
-namespace android {
-
-// Register JNI methods.
-bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env);
-
-}  // namespace android
-}  // namespace chrome
-
-#endif  // CHROME_BROWSER_UI_ANDROID_SSL_CLIENT_CERTIFICATE_REQUEST_H_

chrome/browser/ui/android/tab_model/single_tab_model.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 "chrome/browser/ui/android/tab_model/single_tab_model.h"
-
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
@@ -28,8 +26,3 @@ static void PermanentlyBlockAllNewWindows(
       SingleTabModeTabHelper::FromWebContents(web_contents);
   tab_helper->PermanentlyBlockAllNewWindows();
 }
-
-// Register native methods
-bool RegisterSingleTabModel(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/tab_model/single_tab_model.h

-// Copyright 2015 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 CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_
-#define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_
-
-#include "base/android/jni_android.h"
-
-// Register native methods
-bool RegisterSingleTabModel(JNIEnv* env);
-
-#endif  // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_SINGLE_TAB_MODEL_H_

chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc

@@ -210,10 +210,6 @@ TabModelJniBridge::~TabModelJniBridge() {
   TabModelList::RemoveTabModel(this);
 }
 
-bool TabModelJniBridge::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   jboolean is_incognito,

chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h

@@ -33,9 +33,6 @@ class TabModelJniBridge : public TabModel {
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   ~TabModelJniBridge() override;
 
-  // Registers the JNI bindings.
-  static bool Register(JNIEnv* env);
-
   // Called by JNI
   base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(
       JNIEnv* env,

chrome/browser/ui/android/toolbar/toolbar_model_android.cc

@@ -44,11 +44,6 @@ content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const {
   return content::WebContents::FromJavaWebContents(jweb_contents);
 }
 
-// static
-bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 // static
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,

chrome/browser/ui/android/toolbar/toolbar_model_android.h

@@ -32,8 +32,6 @@ class ToolbarModelAndroid : public ChromeToolbarModelDelegate {
   // ChromeToolbarModelDelegate:
   content::WebContents* GetActiveWebContents() const override;
 
-  static bool RegisterToolbarModelAndroid(JNIEnv* env);
-
  private:
   std::unique_ptr<ToolbarModel> toolbar_model_;
   JavaObjectWeakGlobalRef weak_java_delegate_;

chrome/browser/ui/android/usb_chooser_dialog_android.cc

@@ -241,8 +241,3 @@ bool UsbChooserDialogAndroid::DisplayDevice(
 
   return true;
 }
-
-// static
-bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}

chrome/browser/ui/android/usb_chooser_dialog_android.h

@@ -49,8 +49,6 @@ class UsbChooserDialogAndroid : public device::UsbService::Observer {
   void LoadUsbHelpPage(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& obj);
 
-  static bool Register(JNIEnv* env);
-
  private:
   void GotUsbDeviceList(
       const std::vector<scoped_refptr<device::UsbDevice>>& devices);