Fixes for Safe Browsing with unrelated pending navigations.

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 191dcccfb220252e42762914624028056567febc..8bcf6510dc5d56f9670308643ec802a7aba962b2 100644
--- a/chrome/browser/safe_browsing/ui_manager.h
+++ b/chrome/browser/safe_browsing/ui_manager.h
@@ -25,6 +25,10 @@ namespace base {
 class Thread;
 }  // namespace base
 
+namespace content {
+class NavigationEntry;
+}  // namespace content
+
 namespace net {
 class SSLInfo;
 }  // namespace net
@@ -48,6 +52,7 @@ class SafeBrowsingUIManager
     ~UnsafeResource();
 
     bool IsMainPageLoadBlocked() const;
+    content::NavigationEntry* GetNavigationEntryForResource() const;

[Charlie Reis, 2015/12/11 05:39:24]

Worth having a comment here about why using this is important?

Also, this can return null (as noted before), so the other call sites should
probably check for that.

[mattm, 2015/12/15 01:42:25]

done.
done.

 
     GURL url;
     GURL original_url;