Poll CanPredictNetworkActionsIO in prefetch::IsPrefetchEnabled.

chrome/browser/prefetch/prefetch.cc

Index: chrome/browser/prefetch/prefetch.cc
diff --git a/chrome/browser/prefetch/prefetch.cc b/chrome/browser/prefetch/prefetch.cc
index ccf13e22a1522b185ea993ffc464afa54df85b2a..68eccc6058cc80f1f41646d716a154a938238f79 100644
--- a/chrome/browser/prefetch/prefetch.cc
+++ b/chrome/browser/prefetch/prefetch.cc
@@ -8,6 +8,7 @@
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/prefetch/prefetch_field_trial.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "net/base/network_change_notifier.h"
@@ -17,16 +18,12 @@ namespace prefetch {
 bool IsPrefetchEnabled(content::ResourceContext* resource_context) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
-  // TODO(jkarlin): Eventually tie this to a new Chrome preference to predict
-  // network actions when on cellular connections.  See crbug.com/370454.
-  if (net::NetworkChangeNotifier::IsConnectionCellular(
-          net::NetworkChangeNotifier::GetConnectionType()))
-    return false;
-
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
-  if (io_data != NULL && io_data->network_prediction_enabled()->GetValue())
-    return IsPrefetchFieldTrialEnabled();
-  return false;
+
+  DCHECK(io_data);
+
+  return IsPrefetchFieldTrialEnabled() &&
+      chrome_browser_net::CanPredictNetworkActionsIO(io_data);
 }
 
 }  // namespace prefetch