Refactor BaseBlockingPage to reduce duplicated code

chrome/browser/safe_browsing/safe_browsing_blocking_page.h

 // Copyright (c) 2012 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.
 //
 // Classes for managing the SafeBrowsing interstitial pages.
 //
 // When a user is about to visit a page the SafeBrowsing system has deemed to
 // be malicious, either as malware or a phishing page, we show an interstitial
 // page with some options (go back, continue) to give the user a chance to avoid
 // the harmful page.
@@ skipping 16 matching lines @@
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/task/cancelable_task_tracker.h"
-#include "chrome/browser/safe_browsing/ui_manager.h"
 #include "components/safe_browsing/base_blocking_page.h"
+#include "components/safe_browsing/base_ui_manager.h"
 
 namespace safe_browsing {
 
 class SafeBrowsingBlockingPageFactory;
 class ThreatDetails;
 
 class SafeBrowsingBlockingPage : public BaseBlockingPage {
  public:
   // Interstitial type, used in tests.
   static content::InterstitialPageDelegate::TypeID kTypeForTesting;
@@ skipping 16 matching lines @@
   static void ShowBlockingPage(BaseUIManager* ui_manager,
                                const UnsafeResource& resource);
 
   // Makes the passed |factory| the factory used to instantiate
   // SafeBrowsingBlockingPage objects. Useful for tests.
   static void RegisterFactory(SafeBrowsingBlockingPageFactory* factory) {
     factory_ = factory;
   }
 
   // InterstitialPageDelegate method:
-  void OnProceed() override;
   void OverrideRendererPrefs(content::RendererPreferences* prefs) override;
   content::InterstitialPageDelegate::TypeID GetTypeForTesting() const override;
 
   // Checks the threat type to decide if we should report ThreatDetails.
   static bool ShouldReportThreatDetails(SBThreatType threat_type);
 
  protected:
   friend class SafeBrowsingBlockingPageFactoryImpl;
   friend class SafeBrowsingBlockingPageTest;
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
@@ skipping 14 matching lines @@
   void UpdateReportingPref();  // Used for the transition from old to new pref.
 
   // Don't instantiate this class directly, use ShowBlockingPage instead.
   SafeBrowsingBlockingPage(
       BaseUIManager* ui_manager,
       content::WebContents* web_contents,
       const GURL& main_frame_url,
       const UnsafeResourceList& unsafe_resources,
       const SafeBrowsingErrorUI::SBErrorDisplayOptions& display_options);
 
-  // After a safe browsing interstitial where the user opted-in to the
-  // report but clicked "proceed anyway", we delay the call to
-  // ThreatDetails::FinishCollection() by this much time (in
-  // milliseconds), in order to get data from the blocked resource itself.
-  int64_t threat_details_proceed_delay_ms_;
+  // Called after the user clicks OnProceed(). If the page has malicious
+  // subresources, then we show another interstitial.
+  void HandleSubresourcesAfterProceed() override;
 
   // Called when the interstitial is going away. If there is a
   // pending threat details object, we look at the user's
   // preferences, and if the option to send threat details is
   // enabled, the report is scheduled to be sent on the |ui_manager_|.
   void FinishThreatDetails(const base::TimeDelta& delay,
                            bool did_proceed,
                            int num_visits) override;
 
   // A ThreatDetails object that we start generating when the
   // blocking page is shown. The object will be sent when the warning
   // is gone (if the user enables the feature).
   scoped_refptr<ThreatDetails> threat_details_;
 
   // The factory used to instantiate SafeBrowsingBlockingPage objects.
   // Useful for tests, so they can provide their own implementation of
   // SafeBrowsingBlockingPage.
   static SafeBrowsingBlockingPageFactory* factory_;
-
  private:
   static std::string GetSamplingEventName(
       SafeBrowsingErrorUI::SBInterstitialReason interstitial_reason);
 
   static std::unique_ptr<
       security_interstitials::SecurityInterstitialControllerClient>
   CreateControllerClient(content::WebContents* web_contents,
-                         const UnsafeResourceList& unsafe_resources);
+                         const UnsafeResourceList& unsafe_resources,
+                         const BaseUIManager* ui_manager);
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPage);
 };
 
 // Factory for creating SafeBrowsingBlockingPage.  Useful for tests.
 class SafeBrowsingBlockingPageFactory {
  public:
   virtual ~SafeBrowsingBlockingPageFactory() { }
 
   virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
       BaseUIManager* ui_manager,
       content::WebContents* web_contents,
       const GURL& main_frame_url,
       const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) = 0;
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_