[subresource_filter] Move OnReloadRequested to the ChromeClient

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

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/strings/grit/components_strings.h"
-#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 void SubresourceFilterInfobarDelegate::Create(InfoBarService* infobar_service) {
   infobar_service->AddInfoBar(CreateSubresourceFilterInfoBar(
       base::WrapUnique(new SubresourceFilterInfobarDelegate())));
 }
 
@@ skipping 46 matching lines @@
 
   return l10n_util::GetStringUTF16(
       using_experimental_infobar_
           ? IDS_APP_MENU_RELOAD
           : IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD);
 }
 
 bool SubresourceFilterInfobarDelegate::Cancel() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
-  subresource_filter::ContentSubresourceFilterDriverFactory::FromWebContents(
-      web_contents)
+  ChromeSubresourceFilterClient::FromWebContents(web_contents)

[Bryan McQuade, 2017/05/19 13:24:21]

just to be sure - the ChromeSubresourceFilterClient can never be null here,
right?

[Charlie Harrison, 2017/05/19 13:35:00]

Yes, they are both scoped to the WebContents.

       ->OnReloadRequested();
   return true;
 }
 
 bool SubresourceFilterInfobarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   ChromeSubresourceFilterClient::LogAction(kActionDetailsShown);
   return false;
 }