Fixes for Safe Browsing with unrelated pending navigations.

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_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/hit_report.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 namespace base {
 class Thread;
 }  // namespace base
 
+namespace content {
+class NavigationEntry;
+}  // namespace content
+
 namespace net {
 class SSLInfo;
 }  // namespace net
 
 namespace safe_browsing {
 
 class SafeBrowsingService;
 
 // Construction needs to happen on the main thread.
 class SafeBrowsingUIManager
     : public base::RefCountedThreadSafe<SafeBrowsingUIManager> {
  public:
   // Passed a boolean indicating whether or not it is OK to proceed with
   // loading an URL.
   typedef base::Callback<void(bool /*proceed*/)> UrlCheckCallback;
 
   // Structure used to pass parameters between the IO and UI thread when
   // interacting with the blocking page.
   struct UnsafeResource {
     UnsafeResource();
     ~UnsafeResource();
 
+    // Returns true if this UnsafeResource is a main frame load that was blocked
+    // while the navigation is still pending. Note that a main frame hit may not
+    // be blocking, eg. client side detection happens after the load is
+    // committed.
     bool IsMainPageLoadBlocked() const;
 
+    // Returns the NavigationEntry for this resource (for a main frame hit) or
+    // for the page which contains this resource (for a subresource hit).
+    // This method must not be used if any navigations have occured since the

[Charlie Reis, 2015/12/17 19:24:18]

nit: occurred

[mattm, 2015/12/18 21:41:04]

Done.

+    // hit (eg, it should only be used while the interstitial is showing, or

[Charlie Reis, 2015/12/17 19:24:18]

nit: Are there any other cases it could be used?  If not, s/eg/ie/
(Hard to tell if it's trying to be an exhaustive list right now.)

[mattm, 2015/12/18 21:41:04]

Clarified.

+    // during the OnSafeBrowsingHit observer.)
+    // Return value may be NULL.
+    content::NavigationEntry* GetNavigationEntryForResource() const;
+
     GURL url;
     GURL original_url;
     std::vector<GURL> redirect_urls;
     bool is_subresource;
     bool is_subframe;
     SBThreatType threat_type;
     std::string threat_metadata;
     UrlCheckCallback callback;  // This is called back on |callback_thread|.
     scoped_refptr<base::SingleThreadTaskRunner> callback_thread;
     int render_process_host_id;
@@ skipping 90 matching lines @@
   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_