Componentize SafeBrowsingBlockingPage for WebView use

chrome/browser/safe_browsing/ui_manager.h

Index: chrome/browser/safe_browsing/ui_manager.h
diff --git a/chrome/browser/safe_browsing/ui_manager.h b/chrome/browser/safe_browsing/ui_manager.h
index 1f84cb76a6eb85bbac7ca95bd6923d42752f35e0..b9e88465000008aecb50aa9d82bd5a07e86b07a3 100644
--- a/chrome/browser/safe_browsing/ui_manager.h
+++ b/chrome/browser/safe_browsing/ui_manager.h
@@ -13,6 +13,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -25,13 +26,35 @@ class WebContents;
 struct PermissionReportInfo;
 }  // namespace content
 
+namespace history {
+class HistoryService;
+}  // namespace history
+
 namespace safe_browsing {
 
 struct HitReport;
 
 // Construction needs to happen on the main thread.
-class SafeBrowsingUIManager : public BaseSafeBrowsingUIManager {
+class SafeBrowsingUIManager : public BaseUIManager {
  public:
+  // Observer class can be used to get notified when a SafeBrowsing hit
+  // was found.

[meacer, 2017/01/11 01:33:30]

nit: was -> is

[Jialiu Lin, 2017/01/11 02:53:15]

Done.

+  class Observer {
+   public:
+    // The |resource| was classified as unsafe by SafeBrowsing, and is
+    // not whitelisted.

[meacer, 2017/01/11 01:33:30]

nit: maybe say "Called when |resource| is classified as unsafe ..."?

[Jialiu Lin, 2017/01/11 02:53:15]

Done.

+    // The |resource| must not be accessed after OnSafeBrowsingHit returns.
+    // This method will be called on the UI thread.
+    virtual void OnSafeBrowsingHit(const UnsafeResource& resource) = 0;
+
+   protected:
+    Observer() {}
+    virtual ~Observer() {}
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(Observer);
+  };
+
   explicit SafeBrowsingUIManager(
       const scoped_refptr<SafeBrowsingService>& service);
 
@@ -47,12 +70,6 @@ class SafeBrowsingUIManager : public BaseSafeBrowsingUIManager {
   // chain). Otherwise, |original_url| = |url|.
   void DisplayBlockingPage(const UnsafeResource& resource) override;
 
-  // Log the user perceived delay caused by SafeBrowsing. This delay is the time
-  // delta starting from when we would have started reading data from the
-  // network, and ending when the SafeBrowsing check completes indicating that
-  // the current page is 'safe'.
-  void LogPauseDelay(base::TimeDelta time) override;
-
   // Called on the IO thread by the ThreatDetails with the serialized
   // protocol buffer, so the service can send it over.
   void SendSerializedThreatDetails(const std::string& serialized) override;
@@ -74,6 +91,15 @@ class SafeBrowsingUIManager : public BaseSafeBrowsingUIManager {
   // DisplayBlockingPage(), which creates it.
   static void CreateWhitelistForTesting(content::WebContents* web_contents);
 
+  // Add and remove observers.  These methods must be invoked on the UI thread.

[meacer, 2017/01/11 01:33:30]

tiny nit: Single space after the period.

[Jialiu Lin, 2017/01/11 02:53:15]

Good eye! Done.

+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* remove);
+
+  const std::string app_locale() const override;
+  history::HistoryService* history_service(
+      content::WebContents* web_contents) override;
+  const GURL default_safe_page() const override;
+
  protected:
   ~SafeBrowsingUIManager() override;
 
@@ -95,6 +121,8 @@ class SafeBrowsingUIManager : public BaseSafeBrowsingUIManager {
   // Safebrowsing service.
   scoped_refptr<SafeBrowsingService> sb_service_;
 
+  base::ObserverList<Observer> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };