Fix PredictorTabHelper to work with PlzNavigate.

chrome/browser/net/predictor_tab_helper.cc

 // Copyright 2013 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_tab_helper.h"
 
 #include "base/feature_list.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::PredictorTabHelper);
 
 namespace chrome_browser_net {
 
 namespace {
 
-// Triggers the preconnector on the new navigation api. This captures more
-// navigations.
+// Triggers the preconnector on renderer-initiated navigations. This captures
+// more navigations.
 const base::Feature kPreconnectMore{"PreconnectMore",
                                     base::FEATURE_DISABLED_BY_DEFAULT};
 
 }  // namespace
 
 PredictorTabHelper::PredictorTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       predicted_from_pending_entry_(false) {
 }
 
 PredictorTabHelper::~PredictorTabHelper() {
 }
 
 void PredictorTabHelper::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
-  if (!base::FeatureList::IsEnabled(kPreconnectMore))
+  if (!base::FeatureList::IsEnabled(kPreconnectMore) &&
+      (!content::IsBrowserSideNavigationEnabled() ||
+       navigation_handle->IsRendererInitiated()))

[Charlie Harrison, 2016/12/09 17:23:10]

Note: IsRendererInitiated is a flaky api (crbug.com/637345). Presumably with
PlzNavigate enabled it won't be, though.

     return;
   // Subframe navigations are handled in WitnessURLRequest.
   if (!navigation_handle->IsInMainFrame())
     return;
   if (predicted_from_pending_entry_) {
     predicted_from_pending_entry_ = false;
     return;
   }
   PreconnectUrl(navigation_handle->GetURL());
 }
 
 void PredictorTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::ReloadType reload_type) {
+  // This method isn't needed with PlzNavigate (see comment in header for
+  // predicted_from_pending_entry_)
+  if (content::IsBrowserSideNavigationEnabled())

[Charlie Harrison, 2016/12/09 17:23:10]

Is the method still called in PlzNavigate mode? If not we could make this a
DCHECK.

[jam, 2016/12/09 17:28:48]

Yes it is, but it's planned to be removed.

+    return;
+
   // The standard way to preconnect based on navigation.
   PreconnectUrl(url);
   predicted_from_pending_entry_ = true;
 }
 
 void PredictorTabHelper::DocumentOnLoadCompletedInMainFrame() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   Predictor* predictor = profile->GetNetworkPredictor();
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(profile))
     return;
 #endif
   if (predictor)
     predictor->SaveStateForNextStartup();
 }
 
 void PredictorTabHelper::PreconnectUrl(const GURL& url) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   Predictor* predictor(profile->GetNetworkPredictor());
   if (predictor && url.SchemeIsHTTPOrHTTPS())
     predictor->PreconnectUrlAndSubresources(url, GURL());
 }
 
 }  // namespace chrome_browser_net