[Subresource Filter] Eliminate infobar dependence on //chrome client

We are targeting the ads blocked infobar for componentization and reuse
by WebLayer. To facilitate that componentization this CL eliminates the
infobar's dependence on ChromeSubresourceFilterClient. To do so, we
make ChromeSubresourceFilterClient::OnReloadRequested() an API on the
SubresourceFilterClient interface. There is no behavioral change.

In the future we plan to move the *implementation* of
ChromeSubresourceFilterClient::OnReloadRequested() into the throttle
manager for sharing with //weblayer. However, that is for a later
stage, as it is dependent on first bringing awareness of content
settings into the component. We have put a TODO in the code to this
effect.

Bug: 1116095
Change-Id: Iff57d3a3fe382d0371fc983084e75d3eb8fb7909
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461006
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Eric Robinson <ericrobinson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815532}

chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

@@ -86,6 +86,10 @@ void ChromeSubresourceFilterClient::DidStartNavigation(
 }
 
 void ChromeSubresourceFilterClient::OnReloadRequested() {
+  // TODO(crbug.com/1116095): Once ContentSubresourceFilterThrottleManager knows
+  // about content settings, this method can move entirely into
+  // ContentSubresourceFilterThrottleManager::OnReloadRequested() and
+  // SubresourceFilterClient::OnReloadRequested() can be eliminated.
   subresource_filter::ContentSubresourceFilterThrottleManager::LogAction(
       subresource_filter::SubresourceFilterAction::kAllowlistedSite);
   AllowlistByContentSettings(web_contents()->GetLastCommittedURL());

chrome/browser/subresource_filter/chrome_subresource_filter_client.h

@@ -46,8 +46,6 @@ class ChromeSubresourceFilterClient
   static ChromeSubresourceFilterClient* FromWebContents(
       content::WebContents* web_contents);
 
-  void OnReloadRequested();
-
   // content::WebContentsObserver:
   void DidStartNavigation(
       content::NavigationHandle* navigation_handle) override;
@@ -63,6 +61,7 @@ class ChromeSubresourceFilterClient
       subresource_filter::mojom::AdsViolation triggered_violation) override;
   const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
   GetSafeBrowsingDatabaseManager() override;
+  void OnReloadRequested() override;
 
   // Should be called by devtools in response to a protocol command to enable ad
   // blocking in this WebContents. Should only persist while devtools is

chrome/browser/ui/android/content_settings/ads_blocked_infobar_delegate.cc

@@ -8,7 +8,6 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
 #include "chrome/browser/ui/android/infobars/ads_blocked_infobar.h"
 #include "components/infobars/content/content_infobar_manager.h"
 #include "components/infobars/core/infobar.h"
@@ -78,9 +77,9 @@ base::string16 AdsBlockedInfobarDelegate::GetButtonLabel(
 }
 
 bool AdsBlockedInfobarDelegate::Cancel() {
-  auto* filter_client = ChromeSubresourceFilterClient::FromWebContents(
-      infobars::ContentInfoBarManager::WebContentsFromInfoBar(infobar()));
-  filter_client->OnReloadRequested();
+  subresource_filter::ContentSubresourceFilterThrottleManager::FromWebContents(
+      infobars::ContentInfoBarManager::WebContentsFromInfoBar(infobar()))
+      ->OnReloadRequested();
   return true;
 }
 

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -34,7 +34,6 @@
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
 #include "chrome/common/chrome_features.h"
@@ -1423,8 +1422,9 @@ void ContentSettingSubresourceFilterBubbleModel::OnLearnMoreClicked() {
 
 void ContentSettingSubresourceFilterBubbleModel::CommitChanges() {
   if (is_checked_) {
-    ChromeSubresourceFilterClient::FromWebContents(web_contents())
-        ->OnReloadRequested();
+    subresource_filter::ContentSubresourceFilterThrottleManager::
+        FromWebContents(web_contents())
+            ->OnReloadRequested();
   }
 }
 

components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc

@@ -71,6 +71,7 @@ class SafeBrowsingTriggeredPopupBlockerTest
   GetSafeBrowsingDatabaseManager() override {
     return nullptr;
   }
+  void OnReloadRequested() override {}
 
   // content::RenderViewHostTestHarness:
   void SetUp() override {

components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc

@@ -404,6 +404,10 @@ ContentSubresourceFilterThrottleManager::LoadPolicyForLastCommittedNavigation(
   return base::nullopt;
 }
 
+void ContentSubresourceFilterThrottleManager::OnReloadRequested() {
+  client_->OnReloadRequested();
+}
+
 // static
 void ContentSubresourceFilterThrottleManager::LogAction(
     SubresourceFilterAction action) {

components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h

@@ -142,6 +142,10 @@ class ContentSubresourceFilterThrottleManager
   base::Optional<LoadPolicy> LoadPolicyForLastCommittedNavigation(
       const content::RenderFrameHost* frame_host) const;
 
+  // Notifies the client that the user has requested a reload of a page with
+  // blocked ads (e.g., via an infobar).
+  void OnReloadRequested();
+
   static void LogAction(SubresourceFilterAction action);
 
  protected:

components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc

@@ -196,6 +196,7 @@ class TestSubresourceFilterClient : public SubresourceFilterClient {
   GetSafeBrowsingDatabaseManager() override {
     return database_manager_;
   }
+  void OnReloadRequested() override {}
 
   void CreateSafeBrowsingDatabaseManager() {
     database_manager_ =

components/subresource_filter/content/browser/subresource_filter_client.h

@@ -53,6 +53,10 @@ class SubresourceFilterClient {
   // client, or null if there is no such instance.
   virtual const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
   GetSafeBrowsingDatabaseManager() = 0;
+
+  // Invoked when the user has requested a reload of a page with blocked ads
+  // (e.g., via an infobar).
+  virtual void OnReloadRequested() = 0;
 };
 
 }  // namespace subresource_filter

components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc

@@ -94,6 +94,7 @@ class MockSubresourceFilterClient : public SubresourceFilterClient {
   MOCK_METHOD0(
       GetSafeBrowsingDatabaseManager,
       const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>());
+  MOCK_METHOD0(OnReloadRequested, void());
 
   void AllowlistInCurrentWebContents(const GURL& url) {
     ASSERT_TRUE(url.SchemeIsHTTPOrHTTPS());