Refactor BaseBlockingPage to reduce duplicated code

components/safe_browsing/base_blocking_page.h

 // Copyright 2017 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_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_
 #define COMPONENTS_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/safe_browsing/base_ui_manager.h"
 #include "components/security_interstitials/content/security_interstitial_page.h"
+#include "components/security_interstitials/core/metrics_helper.h"
 #include "components/security_interstitials/core/safe_browsing_error_ui.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "url/gurl.h"
 
-namespace history {
-class HistoryService;
-}
-
 namespace safe_browsing {
 
 // Base class for managing the SafeBrowsing interstitial pages.
 class BaseBlockingPage
     : public security_interstitials::SecurityInterstitialPage {
  public:
   typedef security_interstitials::UnsafeResource UnsafeResource;
   typedef security_interstitials::SafeBrowsingErrorUI SafeBrowsingErrorUI;
   typedef std::vector<UnsafeResource> UnsafeResourceList;
   typedef std::unordered_map<content::WebContents*, UnsafeResourceList>
@@ skipping 64 matching lines @@
   BaseUIManager* ui_manager() const;
 
   const GURL main_frame_url() const;
 
   UnsafeResourceList unsafe_resources() const;
 
   SafeBrowsingErrorUI* sb_error_ui() const;
 
   void set_proceeded(bool proceeded);
 
+  static security_interstitials::MetricsHelper::ReportDetails GetReportingInfo(
+      const UnsafeResourceList& unsafe_resources);
+
+  // Called after OnProceed(). Does nothing in this class, but can be overridden
+  // to handle malicious subresources.
+  virtual void HandleSubresourcesAfterProceed();
+
+  void SetThreatDetailsProceedDelayForTesting(int64_t delay);
+
  private:
   static std::unique_ptr<
       security_interstitials::SecurityInterstitialControllerClient>
   CreateControllerClient(content::WebContents* web_contents,
                          const UnsafeResourceList& unsafe_resources,
-                         history::HistoryService* history_service,
-                         const std::string& app_locale,
-                         const GURL& default_safe_page);
+                         BaseUIManager* ui_manager);
 
   // For reporting back user actions.
   BaseUIManager* ui_manager_;
 
   // The URL of the main frame that caused the warning.
   GURL main_frame_url_;
 
   // The index of a navigation entry that should be removed when DontProceed()
   // is invoked, -1 if entry should not be removed.
   const int navigation_entry_index_to_remove_;
 
   // The list of unsafe resources this page is warning about.
   UnsafeResourceList unsafe_resources_;
 
   // For displaying safe browsing interstitial.
   std::unique_ptr<SafeBrowsingErrorUI> sb_error_ui_;
 
   // Indicate whether user has proceeded this blocking page.
   bool proceeded_;
 
+  // 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_;
+
   DISALLOW_COPY_AND_ASSIGN(BaseBlockingPage);
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_