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();
+
+  GURL page_url = nav_entry->GetURL();

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

nav_entry might be null.

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

Done, thanks for catching! I must have gotten interrupted in the middle of
fixing these :/

   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()) {