[WebLayer] Remove ChromeSecurityStateModelDelegate.

This gets ChromeSecurityStateModelDelegate through ChromePageInfoClient,
thus removing the need for (Chrome)SecurityStateModelDelegate.java.
All references to the above have been removed.

This goes towards removing chrome:// deps from PageInfoController.java
so it can be componentized.

Bug: 1052375
Change-Id: Ib254f9b9a7f274dc8da11095bfbd48d1bee362ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134305
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757555}

chrome/android/BUILD.gn

@@ -2930,7 +2930,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
     "java/src/org/chromium/chrome/browser/site_settings/WebsitePreferenceBridge.java",
     "java/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBar.java",
-    "java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java",
     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
     "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporterBridge.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",

chrome/android/chrome_java_sources.gni

@@ -1513,7 +1513,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/site_settings/WebsitePreferenceBridge.java",
   "java/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBar.java",
   "java/src/org/chromium/chrome/browser/sms/SmsReceiverUma.java",
-  "java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorMediator.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorProperties.java",

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManager.java

@@ -14,7 +14,6 @@ import org.chromium.chrome.browser.customtabs.content.TabObserverRegistrar;
 import org.chromium.chrome.browser.customtabs.content.TabObserverRegistrar.CustomTabTabObserver;
 import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.webapps.WebDisplayMode;
 import org.chromium.chrome.browser.webapps.WebappExtras;
@@ -144,8 +143,7 @@ public class TrustedWebActivityBrowserControlsVisibilityManager {
     @ConnectionSecurityLevel
     @VisibleForTesting
     int getSecurityLevel(Tab tab) {
-        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                tab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(tab.getWebContents());
         return securityLevel;
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java

@@ -13,7 +13,6 @@ import androidx.annotation.DrawableRes;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.embedder_support.view.ContentView;
@@ -144,8 +143,7 @@ public class EphemeralTabMediator {
             @Override
             public void visibleSSLStateChanged() {
                 if (mSheetContent == null) return;
-                int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                        mWebContents, ChromeSecurityStateModelDelegate.getInstance());
+                int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(mWebContents);
                 mSheetContent.setSecurityIcon(getSecurityIconResource(securityLevel));
                 mSheetContent.updateURL(mWebContents.getVisibleUrl());
             }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java

@@ -9,7 +9,6 @@ import androidx.browser.customtabs.CustomTabsSessionToken;
 
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabHidingType;
@@ -65,8 +64,7 @@ public class CustomTabNavigationEventObserver extends EmptyTabObserver {
 
     @Override
     public void onDidAttachInterstitialPage(Tab tab) {
-        boolean isContentDangerous = SecurityStateModel.isContentDangerous(
-                tab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+        boolean isContentDangerous = SecurityStateModel.isContentDangerous(tab.getWebContents());
         if (isContentDangerous) {
             return;
         }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProv
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler;
 import org.chromium.chrome.browser.share.ShareImageFileUtils;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabHidingType;
@@ -180,8 +179,7 @@ public class CustomTabObserver extends EmptyTabObserver {
 
     @Override
     public void onDidAttachInterstitialPage(Tab tab) {
-        if (SecurityStateModel.isContentDangerous(
-                    tab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance())) {
+        if (SecurityStateModel.isContentDangerous(tab.getWebContents())) {
             return;
         }
         resetPageLoadTracking();

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java

@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabThemeColorHelper;
 import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
@@ -180,8 +179,8 @@ public class CustomTabTaskDescriptionHelper implements NativeInitObserver, Destr
                 }
 
                 private boolean hasSecurityWarningOrError(Tab tab) {
-                    boolean isContentDangerous = SecurityStateModel.isContentDangerous(
-                            tab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+                    boolean isContentDangerous =
+                            SecurityStateModel.isContentDangerous(tab.getWebContents());
                     return isContentDangerous;
                 }
             };

chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoController.java

@@ -39,7 +39,6 @@ import org.chromium.chrome.browser.previews.PreviewsUma;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.site_settings.ContentSettingValues;
 import org.chromium.chrome.browser.site_settings.CookieControlsBridge;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.vr.VrModuleProvider;
 import org.chromium.components.content_settings.CookieControlsEnforcement;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
@@ -576,8 +575,7 @@ public class PageInfoController implements ModalDialogProperties.Controller,
             assert false : "Invalid source passed";
         }
 
-        final int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                webContents, ChromeSecurityStateModelDelegate.getInstance());
+        final int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(webContents);
 
         @PreviewPageState
         int previewPageState = PreviewPageState.NOT_PREVIEW;

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.payments.ui.SectionInformation;
 import org.chromium.chrome.browser.payments.ui.ShoppingCart;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
@@ -896,8 +895,7 @@ public class PaymentRequestImpl
 
         mUI = new PaymentRequestUI(activity, this, mMerchantSupportsAutofillCards,
                 !PaymentPreferencesUtil.isPaymentCompleteOnce(), mMerchantName, mTopLevelOrigin,
-                SecurityStateModel.getSecurityLevelForWebContents(
-                        mWebContents, ChromeSecurityStateModelDelegate.getInstance()),
+                SecurityStateModel.getSecurityLevelForWebContents(mWebContents),
                 new ShippingStrings(mShippingType), mPaymentUisShowStateReconciler);
         activity.getLifecycleDispatcher().register(mUI);
 

chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java

@@ -12,7 +12,6 @@ import androidx.annotation.DrawableRes;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.page_info.PageInfoController;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.components.omnibox.SecurityStatusIcon;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.components.security_state.SecurityStateModel;
@@ -123,8 +122,7 @@ import org.chromium.ui.modelutil.PropertyModel;
 
     @Override
     public void didChangeVisibleSecurityState() {
-        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                mWebContentsRef, ChromeSecurityStateModelDelegate.getInstance());
+        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(mWebContentsRef);
         mModel.set(PaymentHandlerToolbarProperties.SECURITY_ICON,
                 getSecurityIconResource(securityLevel));
     }

chrome/android/java/src/org/chromium/chrome/browser/previews/Previews.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.previews;
 
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.security_state.SecurityStateModel;
 import org.chromium.content_public.browser.WebContents;
@@ -21,8 +20,7 @@ public final class Previews {
         if (tab == null || tab.isNativePage()) return false;
         WebContents webContents = tab.getWebContents();
         boolean isPreview = webContents != null && !webContents.isShowingInterstitialPage()
-                && !SecurityStateModel.isContentDangerous(
-                        webContents, ChromeSecurityStateModelDelegate.getInstance())
+                && !SecurityStateModel.isContentDangerous(webContents)
                 && PreviewsAndroidBridge.getInstance().shouldShowPreviewUI(webContents);
         return isPreview;
     }

chrome/android/java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java

-// Copyright 2020 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.
-
-package org.chromium.chrome.browser.ssl;
-
-import androidx.annotation.VisibleForTesting;
-
-import org.chromium.base.annotations.NativeMethods;
-import org.chromium.components.security_state.SecurityStateModelDelegate;
-
-/**
- * Creates the C++ class that acts as the SecurityStateModelDelegate for Chrome.
- */
-public class ChromeSecurityStateModelDelegate {
-    private static SecurityStateModelDelegate sInstance = new SecurityStateModelDelegate(
-            ChromeSecurityStateModelDelegateJni.get().createSecurityStateModelDelegate());
-
-    /**
-     * Get an instance of SecurityStateModelDelegate.
-     */
-    public static SecurityStateModelDelegate getInstance() {
-        return sInstance;
-    }
-
-    @NativeMethods
-    @VisibleForTesting
-    public interface Natives {
-        long createSecurityStateModelDelegate();
-    }
-}

chrome/android/java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java

@@ -10,7 +10,6 @@ import android.os.Message;
 
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
@@ -193,8 +192,8 @@ public class TabStateBrowserControlsVisibilityDelegate
         enableHidingBrowserControls &= !url.startsWith(UrlConstants.CHROME_URL_PREFIX);
         enableHidingBrowserControls &= !url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
 
-        enableHidingBrowserControls &= !SecurityStateModel.isContentDangerous(
-                mTab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+        enableHidingBrowserControls &=
+                !SecurityStateModel.isContentDangerous(mTab.getWebContents());
         enableHidingBrowserControls &=
                 !SelectionPopupController.fromWebContents(webContents).isFocusedNodeEditable();
         enableHidingBrowserControls &= !mTab.isShowingErrorPage();

chrome/android/java/src/org/chromium/chrome/browser/tab/TabThemeColorHelper.java

@@ -11,7 +11,6 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.UserData;
 import org.chromium.chrome.browser.previews.Previews;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.components.security_state.SecurityStateModel;
@@ -155,8 +154,8 @@ public class TabThemeColorHelper extends EmptyTabObserver implements UserData {
      */
     private boolean checkThemingAllowed() {
         // Do not apply the theme color if there are any security issues on the page.
-        final int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                mTab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+        final int securityLevel =
+                SecurityStateModel.getSecurityLevelForWebContents(mTab.getWebContents());
         return securityLevel != ConnectionSecurityLevel.DANGEROUS
                 && securityLevel != ConnectionSecurityLevel.SECURE_WITH_POLICY_INSTALLED_CERT
                 && (mTab.getActivity() == null || !mTab.getActivity().isTablet())

chrome/android/java/src/org/chromium/chrome/browser/tab/TrustedCdn.java

@@ -9,7 +9,6 @@ import androidx.annotation.Nullable;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.components.security_state.SecurityStateModel;
 import org.chromium.content_public.browser.WebContents;
@@ -81,8 +80,8 @@ public class TrustedCdn extends TabWebContentsUserData {
     }
 
     private int getSecurityLevel() {
-        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                mTab.getWebContents(), ChromeSecurityStateModelDelegate.getInstance());
+        int securityLevel =
+                SecurityStateModel.getSecurityLevelForWebContents(mTab.getWebContents());
         return securityLevel;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -29,7 +29,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarData;
 import org.chromium.chrome.browser.previews.Previews;
 import org.chromium.chrome.browser.previews.PreviewsAndroidBridge;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabUtils;
 import org.chromium.chrome.browser.tab.TrustedCdn;
@@ -403,8 +402,7 @@ public class LocationBarModel implements ToolbarDataProvider, ToolbarCommonPrope
     @VisibleForTesting
     @ConnectionSecurityLevel
     int getSecurityLevelFromStateModel(WebContents webContents) {
-        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
-                webContents, ChromeSecurityStateModelDelegate.getInstance());
+        int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(webContents);
         return securityLevel;
     }
 

chrome/android/junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManagerTest.java

@@ -29,8 +29,6 @@ import org.chromium.chrome.browser.customtabs.CloseButtonVisibilityManager;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
 import org.chromium.chrome.browser.customtabs.content.TabObserverRegistrar;
 import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegate;
-import org.chromium.chrome.browser.ssl.ChromeSecurityStateModelDelegateJni;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.webapps.WebDisplayMode;
@@ -53,8 +51,6 @@ public class TrustedWebActivityBrowserControlsVisibilityManagerTest {
     @Mock
     public TabImpl mTab;
     @Mock
-    ChromeSecurityStateModelDelegate.Natives mChromeSecurityStateModelDelegateMocks;
-    @Mock
     SecurityStateModel.Natives mSecurityStateMocks;
     @Mock
     public CustomTabToolbarCoordinator mToolbarCoordinator;
@@ -68,8 +64,6 @@ public class TrustedWebActivityBrowserControlsVisibilityManagerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         SecurityStateModelJni.TEST_HOOKS.setInstanceForTesting(mSecurityStateMocks);
-        ChromeSecurityStateModelDelegateJni.TEST_HOOKS.setInstanceForTesting(
-                mChromeSecurityStateModelDelegateMocks);
         when(mTabProvider.getTab()).thenReturn(mTab);
         when(mTab.getParentId()).thenReturn(Tab.INVALID_TAB_ID);
         setTabSecurityLevel(ConnectionSecurityLevel.NONE);

chrome/browser/BUILD.gn

@@ -2965,6 +2965,8 @@ jumbo_static_library("browser") {
       "signin/identity_services_provider_android.cc",
       "signin/signin_manager_android_factory.cc",
       "signin/signin_manager_android_factory.h",
+      "ssl/chrome_security_state_client.cc",
+      "ssl/chrome_security_state_client.h",
       "ssl/chrome_security_state_model_delegate.cc",
       "ssl/chrome_security_state_model_delegate.h",
       "ssl/known_interception_disclosure_infobar.cc",

chrome/browser/browser_process_impl.cc

@@ -159,6 +159,7 @@
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/component_updater/background_task_update_scheduler.h"
 #include "chrome/browser/flags/android/chrome_feature_list.h"
+#include "chrome/browser/ssl/chrome_security_state_client.h"
 #else
 #include "chrome/browser/gcm/gcm_product_util.h"
 #include "chrome/browser/resource_coordinator/tab_manager.h"
@@ -1192,6 +1193,10 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
   }
 
   CreateNetworkQualityObserver();
+
+#if defined(OS_ANDROID)
+  security_state::SetSecurityStateClient(new ChromeSecurityStateClient());
+#endif
 }
 
 void BrowserProcessImpl::CreateIconManager() {

chrome/browser/ssl/chrome_security_state_client.cc

+// Copyright 2020 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 "chrome/browser/ssl/chrome_security_state_client.h"
+
+#include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
+
+std::unique_ptr<SecurityStateModelDelegate>
+ChromeSecurityStateClient::MaybeCreateSecurityStateModelDelegate() {
+  return std::make_unique<ChromeSecurityStateModelDelegate>();
+}

chrome/browser/ssl/chrome_security_state_client.h

+// Copyright 2020 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_SSL_CHROME_SECURITY_STATE_CLIENT_H_
+#define CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_CLIENT_H_
+
+#include <memory>
+#include "components/security_state/content/android/security_state_client.h"
+
+class ChromeSecurityStateClient : public security_state::SecurityStateClient {
+ public:
+  constexpr ChromeSecurityStateClient() = default;
+  ~ChromeSecurityStateClient() = default;
+
+  std::unique_ptr<SecurityStateModelDelegate>
+  MaybeCreateSecurityStateModelDelegate() override;
+};
+
+#endif  // CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_CLIENT_H_

chrome/browser/ssl/chrome_security_state_model_delegate.cc

@@ -4,17 +4,10 @@
 
 #include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
 
-#include "chrome/android/chrome_jni_headers/ChromeSecurityStateModelDelegate_jni.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/web_contents.h"
 
-static jlong
-JNI_ChromeSecurityStateModelDelegate_CreateSecurityStateModelDelegate(
-    JNIEnv* env) {
-  return reinterpret_cast<intptr_t>(new ChromeSecurityStateModelDelegate());
-}
-
 security_state::SecurityLevel
 ChromeSecurityStateModelDelegate::GetSecurityLevel(
     content::WebContents* web_contents) const {

chrome/browser/ssl/chrome_security_state_model_delegate.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/security_state/content/android/security_state_model_delegate.h"
-
 #ifndef CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_DELEGATE_H_
 #define CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_DELEGATE_H_
 
+#include "components/security_state/content/android/security_state_model_delegate.h"
+
 namespace content {
 class WebContents;
 }  // namespace content

chrome/browser/ui/BUILD.gn

@@ -423,7 +423,6 @@ jumbo_static_library("ui") {
     "//chrome/services/qrcode_generator/public/cpp",
     "//chrome/services/qrcode_generator/public/mojom",
     "//components/about_ui",
-    "//components/client_hints/browser",
     "//components/account_id",
     "//components/autofill/content/browser:risk_proto",
     "//components/autofill/core/browser",
@@ -434,6 +433,7 @@ jumbo_static_library("ui") {
     "//components/browsing_data/core",
     "//components/captive_portal/content",
     "//components/captive_portal/core:buildflags",
+    "//components/client_hints/browser",
     "//components/consent_auditor/",
     "//components/content_settings/core/browser",
     "//components/country_codes",
@@ -624,6 +624,7 @@ jumbo_static_library("ui") {
       "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",
       "//chrome/browser/ui/webui/snippets_internals:mojo_bindings",
       "//components/browser_ui/util/android",
+      "//components/security_state/content/android",
     ]
     if (enable_feed_in_chrome) {
       deps += [ "//chrome/browser/ui/webui/feed_internals:mojo_bindings" ]

components/security_state/content/android/BUILD.gn

@@ -6,6 +6,8 @@ import("//build/config/android/rules.gni")
 
 static_library("android") {
   sources = [
+    "security_state_client.cc",
+    "security_state_client.h",
     "security_state_model_android.cc",
     "security_state_model_delegate.h",
   ]
@@ -21,7 +23,6 @@ static_library("android") {
 android_library("java") {
   sources = [
     "java/src/org/chromium/components/security_state/SecurityStateModel.java",
-    "java/src/org/chromium/components/security_state/SecurityStateModelDelegate.java",
   ]
   deps = [
     "//base:base_java",
@@ -36,6 +37,5 @@ android_library("java") {
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/components/security_state/SecurityStateModel.java",
-    "java/src/org/chromium/components/security_state/SecurityStateModelDelegate.java",
   ]
 }

components/security_state/content/android/java/src/org/chromium/components/security_state/SecurityStateModel.java

@@ -21,17 +21,13 @@ public class SecurityStateModel {
      *
      * @see ConnectionSecurityLevel
      */
-    public static int getSecurityLevelForWebContents(
-            WebContents webContents, SecurityStateModelDelegate delegate) {
+    public static int getSecurityLevelForWebContents(WebContents webContents) {
         if (webContents == null) return ConnectionSecurityLevel.NONE;
-        return SecurityStateModelJni.get().getSecurityLevelForWebContents(
-                webContents, delegate.getNativePtr());
+        return SecurityStateModelJni.get().getSecurityLevelForWebContents(webContents);
     }
 
-    public static boolean isContentDangerous(
-            WebContents webContents, SecurityStateModelDelegate delegate) {
-        return getSecurityLevelForWebContents(webContents, delegate)
-                == ConnectionSecurityLevel.DANGEROUS;
+    public static boolean isContentDangerous(WebContents webContents) {
+        return getSecurityLevelForWebContents(webContents) == ConnectionSecurityLevel.DANGEROUS;
     }
 
     /**
@@ -50,7 +46,7 @@ public class SecurityStateModel {
     @NativeMethods
     @VisibleForTesting
     public interface Natives {
-        int getSecurityLevelForWebContents(WebContents webContents, long delegate);
+        int getSecurityLevelForWebContents(WebContents webContents);
         boolean shouldShowDangerTriangleForWarningLevel();
     }
 }

components/security_state/content/android/java/src/org/chromium/components/security_state/SecurityStateModelDelegate.java

-// Copyright 2020 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.
-
-package org.chromium.components.security_state;
-
-import org.chromium.base.annotations.CalledByNative;
-
-/**
- * Dumb wrapper around the pointer to the C++ class SecurityStateModelDelegate.
- */
-public class SecurityStateModelDelegate {
-    private long mNativePtr;
-
-    public SecurityStateModelDelegate(long nativePtr) {
-        this.mNativePtr = nativePtr;
-    }
-
-    @CalledByNative
-    protected long getNativePtr() {
-        return mNativePtr;
-    }
-}

components/security_state/content/android/security_state_client.cc

+// Copyright 2020 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 "components/security_state/content/android/security_state_client.h"
+
+namespace security_state {
+
+static SecurityStateClient* g_client;
+
+void SetSecurityStateClient(SecurityStateClient* client) {
+  g_client = client;
+}
+
+SecurityStateClient* GetSecurityStateClient() {
+  return g_client;
+}
+
+std::unique_ptr<SecurityStateModelDelegate>
+SecurityStateClient::MaybeCreateSecurityStateModelDelegate() {
+  return nullptr;
+}
+
+}  // namespace security_state

components/security_state/content/android/security_state_client.h

+// Copyright 2020 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 COMPONENTS_SECURITY_STATE_CONTENT_ANDROID_SECURITY_STATE_CLIENT_H_
+#define COMPONENTS_SECURITY_STATE_CONTENT_ANDROID_SECURITY_STATE_CLIENT_H_
+
+#include <memory>
+#include "components/security_state/content/android/security_state_model_delegate.h"
+
+namespace security_state {
+class SecurityStateClient;
+
+void SetSecurityStateClient(SecurityStateClient* security_state_client);
+SecurityStateClient* GetSecurityStateClient();
+
+class SecurityStateClient {
+ public:
+  SecurityStateClient() = default;
+  ~SecurityStateClient() = default;
+
+  // Create a SecurityStateModelDelegate. This can return a nullptr.
+  virtual std::unique_ptr<SecurityStateModelDelegate>
+  MaybeCreateSecurityStateModelDelegate();
+};
+}  // namespace security_state
+
+#endif  // COMPONENTS_SECURITY_STATE_CONTENT_ANDROID_SECURITY_STATE_CLIENT_H_

components/security_state/content/android/security_state_model_android.cc

@@ -5,6 +5,7 @@
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "components/security_state/content/android/jni_headers/SecurityStateModel_jni.h"
+#include "components/security_state/content/android/security_state_client.h"
 #include "components/security_state/content/android/security_state_model_delegate.h"
 #include "components/security_state/content/content_utils.h"
 #include "components/security_state/core/security_state.h"
@@ -16,14 +17,17 @@ using base::android::JavaParamRef;
 // static
 jint JNI_SecurityStateModel_GetSecurityLevelForWebContents(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& jweb_contents,
-    jlong jdelegate) {
+    const base::android::JavaParamRef<jobject>& jweb_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
 
-  SecurityStateModelDelegate* security_state_model_delegate =
-      reinterpret_cast<SecurityStateModelDelegate*>(jdelegate);
+  security_state::SecurityStateClient* security_state_client =
+      security_state::GetSecurityStateClient();
+  DCHECK(security_state_client);
+
+  std::unique_ptr<SecurityStateModelDelegate> security_state_model_delegate =
+      security_state_client->MaybeCreateSecurityStateModelDelegate();
 
   if (security_state_model_delegate)
     return security_state_model_delegate->GetSecurityLevel(web_contents);