Revert of Change net's predictor_tab_helper to use the new content Navigation API

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 "base/command_line.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
-#include "components/variations/variations_associated_data.h"
-#include "content/public/browser/navigation_handle.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.
-const base::Feature kPreconnectMore{"PreconnectMore",
-                                    base::FEATURE_DISABLED_BY_DEFAULT};
-
-}  // namespace
-
 PredictorTabHelper::PredictorTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
 }
 
 PredictorTabHelper::~PredictorTabHelper() {
 }
 
-void PredictorTabHelper::DidStartNavigation(
-    content::NavigationHandle* navigation_handle) {
-  if (!base::FeatureList::IsEnabled(kPreconnectMore))
-    return;
-  // Subframe navigations require a param check.
-  if (!navigation_handle->IsInMainFrame() &&
-      variations::GetVariationParamValue("PreconnectMore",
-                                         "preconnect_subframes") != "true") {
-    return;
-  }
-  PreconnectUrl(navigation_handle->GetURL());
-}
-
 void PredictorTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
-  // The standard way to preconnect based on navigation.
-  if (!base::FeatureList::IsEnabled(kPreconnectMore))
-    PreconnectUrl(url);
-}
-
-void PredictorTabHelper::PreconnectUrl(const GURL& url) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   chrome_browser_net::Predictor* predictor = profile->GetNetworkPredictor();
-  if (predictor && url.SchemeIsHTTPOrHTTPS())
+  if (!predictor)
+    return;
+  if (url.SchemeIs(url::kHttpScheme) || url.SchemeIs(url::kHttpsScheme))
     predictor->PreconnectUrlAndSubresources(url, GURL());
 }
 
 }  // namespace chrome_browser_net