Make Network Predictor skip empty urls

chrome/browser/net/predictor.cc

 // 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.
 
 #include "chrome/browser/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iterator>
 #include <set>
@@ skipping 224 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&Predictor::Resolve, base::Unretained(this),
                      CanonicalizeUrl(url), motivation));
 }
 
 void Predictor::PreconnectUrlAndSubresources(const GURL& url,
     const GURL& first_party_for_cookies) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (!PredictorEnabled() || !url.is_valid() ||
-      !url.has_host())
+  if (!PredictorEnabled())
     return;
   if (!CanPreresolveAndPreconnect())
     return;
-
+  GURL canonicalized_url = CanonicalizeUrl(url);

[Charlie Harrison, 2017/05/15 17:01:25]

nit: const GURL

[xunjieli, 2017/05/15 17:06:50]

Done.

+  if (!canonicalized_url.is_valid() || !canonicalized_url.has_host())
+    return;
   UrlInfo::ResolutionMotivation motivation(UrlInfo::EARLY_LOAD_MOTIVATED);
   const int kConnectionsNeeded = 1;
-  PreconnectUrl(CanonicalizeUrl(url), first_party_for_cookies, motivation,
+  PreconnectUrl(canonicalized_url, first_party_for_cookies, motivation,
                 kConnectionsNeeded, kAllowCredentialsOnPreconnectByDefault);
-  PredictFrameSubresources(url.GetWithEmptyPath(), first_party_for_cookies);
+  PredictFrameSubresources(canonicalized_url.GetWithEmptyPath(),
+                           first_party_for_cookies);
 }
 
 std::vector<GURL> Predictor::GetPredictedUrlListAtStartup(
     PrefService* user_prefs) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::vector<GURL> urls;
   // Recall list of URLs we learned about during last session.
   // This may catch secondary hostnames, pulled in by the homepages.  It will
   // also catch more of the "primary" home pages, since that was (presumably)
   // rendered first (and will be rendered first this time too).
@@ skipping 452 matching lines @@
   SerializeReferrers(referral_list);
 }
 
 void Predictor::PreconnectUrl(const GURL& url,
                               const GURL& first_party_for_cookies,
                               UrlInfo::ResolutionMotivation motivation,
                               bool allow_credentials,
                               int count) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK(url.is_valid());
 
   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     PreconnectUrlOnIOThread(url, first_party_for_cookies, motivation,
                             allow_credentials, count);
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::BindOnce(&Predictor::PreconnectUrlOnIOThread,
                        base::Unretained(this), url, first_party_for_cookies,
                        motivation, allow_credentials, count));
@@ skipping 459 matching lines @@
 }
 
 void SimplePredictor::ShutdownOnUIThread() {
   SetShutdown(true);
 }
 
 bool SimplePredictor::CanPrefetchAndPrerender() const { return true; }
 bool SimplePredictor::CanPreresolveAndPreconnect() const { return true; }
 
 }  // namespace chrome_browser_net