disable-AdsBlockedInfoBar.patch

build/patches/disable-AdsBlockedInfoBar.patch

@@ -3,8 +3,8 @@ Date: Mon, 26 Aug 2019 17:54:28 -0400
 Subject: disable AdsBlockedInfoBar
 
 ---
- .../chrome_subresource_filter_client.cc              | 12 ------------
- 1 file changed, 12 deletions(-)
+ .../chrome_subresource_filter_client.cc                | 10 ----------
+ 1 file changed, 10 deletions(-)
 
 diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -17,27 +17,25 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/subresource_filter/subresource_filter_profile_context_factory.h"
-@@ -32,11 +31,6 @@
- #include "content/public/browser/render_frame_host.h"
+@@ -33,10 +32,6 @@
+ #include "content/public/browser/web_contents.h"
  #include "services/metrics/public/cpp/ukm_source_id.h"
  
 -#if defined(OS_ANDROID)
--#include "chrome/browser/ui/android/infobars/chrome_confirm_infobar.h"
 -#include "components/subresource_filter/android/ads_blocked_infobar_delegate.h"
 -#endif
 -
  ChromeSubresourceFilterClient::ChromeSubresourceFilterClient(
      content::WebContents* web_contents)
-     : content::WebContentsObserver(web_contents) {
-@@ -224,12 +218,6 @@ void ChromeSubresourceFilterClient::ToggleForceActivationInCurrentWebContents(
+     : web_contents_(web_contents) {
+@@ -126,11 +121,6 @@ ChromeSubresourceFilterClient::GetProfileInteractionManager() {
  }
  
  void ChromeSubresourceFilterClient::ShowUI(const GURL& url) {
 -#if defined(OS_ANDROID)
 -  InfoBarService* infobar_service =
--      InfoBarService::FromWebContents(web_contents());
--  subresource_filter::AdsBlockedInfobarDelegate::Create(
--      infobar_service, ChromeConfirmInfoBar::GetResourceIdMapper());
+-      InfoBarService::FromWebContents(web_contents_);
+-  subresource_filter::AdsBlockedInfobarDelegate::Create(infobar_service);
 -#endif
    // TODO(https://crbug.com/1103176): Plumb the actual frame reference here
    // (it comes  from