Fixes for Safe Browsing with unrelated pending navigations.

chrome/browser/safe_browsing/threat_details.cc

Index: chrome/browser/safe_browsing/threat_details.cc
diff --git a/chrome/browser/safe_browsing/threat_details.cc b/chrome/browser/safe_browsing/threat_details.cc
index af89c5ccf0a2a0cd045e05e81f0f14dfbaa377fe..5506eba84cd4d6f8223c0eb1051584e7bd76a852 100644
--- a/chrome/browser/safe_browsing/threat_details.cc
+++ b/chrome/browser/safe_browsing/threat_details.cc
@@ -182,17 +182,15 @@ void ThreatDetails::StartCollection() {
     report_->set_type(GetReportTypeFromSBThreatType(resource_.threat_type));
   }
 
-  GURL page_url = web_contents()->GetURL();
+  NavigationEntry* nav_entry = resource_.GetNavigationEntryForResource();

[Nathan Parker, 2015/12/11 19:48:06]

Is there any case where web_contents_ would be different from that returned by
GetWebContentsByID(render_process_host_id, render_view_id)?

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

I don't think so. The web_contents_ is passed in from SafeBrowsingBlockingPage,
and SBBP gets it's web_contents_ from the same
GetWebContentsByID(unsafe_resource.render_process_host_id,unsafe_resource.render_view_id):

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/saf...

+
+  GURL page_url = nav_entry->GetURL();
   if (IsReportableUrl(page_url))
     report_->set_page_url(page_url.spec());
 
-  GURL referrer_url;
-  NavigationEntry* nav_entry = web_contents()->GetController().GetActiveEntry();
-  if (nav_entry) {
-    referrer_url = nav_entry->GetReferrer().url;
-    if (IsReportableUrl(referrer_url)) {
-      report_->set_referrer_url(referrer_url.spec());
-    }
+  GURL referrer_url = nav_entry->GetReferrer().url;
+  if (IsReportableUrl(referrer_url)) {
+    report_->set_referrer_url(referrer_url.spec());
   }
 
   // Add the nodes, starting from the page url.
@@ -224,7 +222,7 @@ void ThreatDetails::StartCollection() {
   }
 
   // Add the referrer url.
-  if (nav_entry && !referrer_url.is_empty())
+  if (!referrer_url.is_empty())
     AddUrl(referrer_url, GURL(), std::string(), NULL);
 
   if (!resource_.IsMainPageLoadBlocked()) {