Unbundle link rel=prefetch from privacy settings

chrome/browser/prefetch/prefetch_browsertest.cc

Index: chrome/browser/prefetch/prefetch_browsertest.cc
diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc
index 41878f1182c5318de93346386d29189bc2561ce0..5ade23934e3a9d20191cfd5f3dd77140f71191e2 100644
--- a/chrome/browser/prefetch/prefetch_browsertest.cc
+++ b/chrome/browser/prefetch/prefetch_browsertest.cc
@@ -97,31 +97,32 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPredictionDisabled,
   EXPECT_TRUE(RunPrefetchExperiment(false, browser()));
 }
 
-// Prefetch should be allowed depending on preference and network type.
+// When initiated from the renderer, prefetch should be allowed regardless of
+// the network type.
 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, PreferenceWorks) {
   // Set real NetworkChangeNotifier singleton aside.
   scoped_ptr<NetworkChangeNotifier::DisableForTest> disable_for_test(
       new NetworkChangeNotifier::DisableForTest);
 
-  // Preference defaults to WIFI_ONLY: prefetch when not on cellular.
+  // Preference defaults to ALWAYS.
   {
     scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifierWIFI);
     EXPECT_TRUE(RunPrefetchExperiment(true, browser()));
   }
   {
     scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifier4G);
-    EXPECT_TRUE(RunPrefetchExperiment(false, browser()));
+    EXPECT_TRUE(RunPrefetchExperiment(true, browser()));
   }
 
-  // Set preference to NEVER: never prefetch.
+  // Set preference to NEVER: prefetch should be unaffected.
   SetPreference(NetworkPredictionOptions::NETWORK_PREDICTION_NEVER);
   {
     scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifierWIFI);
-    EXPECT_TRUE(RunPrefetchExperiment(false, browser()));
+    EXPECT_TRUE(RunPrefetchExperiment(true, browser()));
   }
   {
     scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifier4G);
-    EXPECT_TRUE(RunPrefetchExperiment(false, browser()));
+    EXPECT_TRUE(RunPrefetchExperiment(true, browser()));
   }
 }