Downgrade security state while displaying an SB interstitial

chrome/browser/safe_browsing/ui_manager.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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 
@@ skipping 107 matching lines @@
   // on IO thread. If shutdown is true, the manager is disabled permanently.
   void StopOnIOThread(bool shutdown);
 
   // Called on the UI thread to display an interstitial page.
   // |url| is the url of the resource that matches a safe browsing list.
   // If the request contained a chain of redirects, |url| is the last url
   // in the chain, and |original_url| is the first one (the root of the
   // chain). Otherwise, |original_url| = |url|.
   virtual void DisplayBlockingPage(const UnsafeResource& resource);
 
-  // A wrapper method for IsUrlWhitelistedForWebContents, for convenience.
+  // A convenience wrapper method for IsUrlWhitelistedOrPendingForWebContents.
   bool IsWhitelisted(const UnsafeResource& resource);
 
-  // Returns true if we already displayed an interstitial for that top-level
-  // site in a given WebContents. Called on the UI thread.
-  bool IsUrlWhitelistedForWebContents(const GURL& url,
-                                      bool is_subresource,
-                                      content::NavigationEntry* entry,
-                                      content::WebContents* web_contents);
+  // Checks if we already displayed an interstitial for that top-level
+  // site in a given WebContents. If |whitelist_only|, it returns true only if
+  // the user chose to ignore the interstitial; otherwise it returns true as
+  // long as the user has seen an interstitial (regardless of response).
+  // Called on the UI thread.
+  bool IsUrlWhitelistedOrPendingForWebContents(
+      const GURL& url,
+      bool is_subresource,
+      content::NavigationEntry* entry,
+      content::WebContents* web_contents,
+      bool whitelist_only);
 
   // The blocking page on the UI thread has completed.
   void OnBlockingPageDone(const std::vector<UnsafeResource>& resources,
                           bool proceed);
 
   // 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);
@@ skipping 35 matching lines @@
       const safe_browsing::HitReport& hit_report);
 
   // Sends an invalid certificate chain report over the network.
   void ReportInvalidCertificateChainOnIOThread(
       const std::string& serialized_report);
 
   // Report permission action to SafeBrowsing servers.
   void ReportPermissionActionOnIOThread(
       const PermissionReportInfo& report_info);
 
-  // Updates the whitelist state.  Called on the UI thread.
-  void AddToWhitelist(const UnsafeResource& resource);
+  // Updates the whitelist URL set.  Called on the UI thread.
+  void AddToWhitelistUrlSet(const UnsafeResource& resource, bool is_pending);
 
   // Safebrowsing service.
   scoped_refptr<SafeBrowsingService> sb_service_;
 
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_