Change text of DNS prefetch option to Network prediction option.

The "DNS Prefetch" option currently controls DNS prefetching, TCP preconnection,
and prerendering of pages. This modifies the text string to replace
this, and changes variable names to reflect it.

The underlying preference name remains the same so settings are not
lost. However, I changed the policy name to make name changes
consistent. If this does not migrate well, I will retain the old
policy name.

BUG=77783
TEST=Existing tests, make sure text is correct in browser.

Review URL: http://codereview.chromium.org/6793045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80768 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 63 insertions, 56 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 421200b..aa5dbe0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5882,8 +5882,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Check your DNS settings. Contact your network administrator if you're
         not sure what this means.
       </message>
-      <message name="IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH" desc="When a page fails to load, sometimes we suggest disabling prefetching.">
-        Try disabling DNS prefetching by following these steps:
+      <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION" desc="When a page fails to load, sometimes we suggest disabling network prediction.">
+        Try disabling network prediction by following these steps:
         Go to
         <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
         Wrench menu &gt;
@@ -5891,7 +5891,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         &gt;
         <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
         <ph name="END_BOLD">&lt;/strong&gt;</ph>
-        and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent="noPrefetchTitle"&gt;&lt;/span&gt;<ex>Use DNS pre-fetching to improve page load performance</ex></ph>.&quot;
+        and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Predict network actions to improve page load performance</ex></ph>.&quot;
       </message>
       <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG" desc="When a web page fails to load, in some cases we suggest reconfiguring the firewall.">
         Try adding
@@ -5900,7 +5900,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         already a permitted program, try deleting it from the list of permitted programs
         and adding it again.
       </message>
-
       <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a web page fails to load, in some cases we suggest checking the proxy server configuration.">
         If you use a proxy server, check your proxy settings or check with your network administrator
         to make sure the proxy server is working.
@@ -7369,8 +7368,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </if>
 
       <!-- Misc advanced option description strings. -->
-      <message name="IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables DNS prefetching.  DNS prefetching involves scanning pages and user text entries, guessing what domain the user may next navigate to, and obtaining the domain's DNS information for that URL in advance. ">
-        Use DNS pre-fetching to improve page load performance
+      <message name="IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables prediction of network actions.  Actions include DNS prefetching, TCP and SSL preconnection, and prerendering of web pages.">
+        Predict network actions to improve page load performance
       </message>
 
       <!-- Collected cookies window -->
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index ac96799..08f6625 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -218,8 +218,8 @@
       'features': {'dynamic_refresh': 1},
       'example_value': True,
       'id': 7,
-      'caption': '''Enable DNS prefetching''',
-      'desc': '''Enables DNS prefetching in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+      'caption': '''Enable network prediction.''',
+      'desc': '''Enables network prediction in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
 
       If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index 0a1a01c..597af94 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -32,7 +32,8 @@ NetPrefObserver::NetPrefObserver(PrefService* prefs,
     : prerender_manager_(prerender_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(prefs);
-  dns_prefetching_enabled_.Init(prefs::kDnsPrefetchingEnabled, prefs, this);
+  network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
+                                   this);
   spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
   http_throttling_enabled_.Init(prefs::kHttpThrottlingEnabled, prefs, this);
 
@@ -55,9 +56,9 @@ void NetPrefObserver::Observe(NotificationType type,
 void NetPrefObserver::ApplySettings(const std::string* pref_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  chrome_browser_net::EnablePredictor(*dns_prefetching_enabled_);
+  chrome_browser_net::EnablePredictor(*network_prediction_enabled_);
   if (prerender_manager_)
-    prerender_manager_->set_enabled(*dns_prefetching_enabled_);
+    prerender_manager_->set_enabled(*network_prediction_enabled_);
   net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
 
   if (!pref_name || *pref_name == prefs::kHttpThrottlingEnabled) {
@@ -70,6 +71,7 @@ void NetPrefObserver::ApplySettings(const std::string* pref_name) {
 
 // static
 void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
+  prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, true);
   prefs->RegisterBooleanPref(prefs::kDisableSpdy, false);
   prefs->RegisterBooleanPref(prefs::kHttpThrottlingEnabled, false);
 }
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index 3c33c16..a03129e 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -40,7 +40,7 @@ class NetPrefObserver : public NotificationObserver {
   // If |pref_name| is NULL, all monitored preferences will be applied.
   void ApplySettings(const std::string* pref_name);
 
-  BooleanPrefMember dns_prefetching_enabled_;
+  BooleanPrefMember network_prediction_enabled_;
   BooleanPrefMember spdy_disabled_;
   BooleanPrefMember http_throttling_enabled_;
   scoped_refptr<prerender::PrerenderManager> prerender_manager_;
diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc
index ba3bd28..5cdf5c9 100644
--- a/chrome/browser/net/predictor_api.cc
+++ b/chrome/browser/net/predictor_api.cc
@@ -147,7 +147,6 @@ void DiscardInitialNavigationHistory() {
 void RegisterUserPrefs(PrefService* user_prefs) {
   user_prefs->RegisterListPref(prefs::kDnsPrefetchingStartupList);
   user_prefs->RegisterListPref(prefs::kDnsPrefetchingHostReferralList);
-  user_prefs->RegisterBooleanPref(prefs::kDnsPrefetchingEnabled, true);
 }
 
 // When enabled, we use the following instance to service all requests in the
@@ -401,7 +400,7 @@ static void InitNetworkPredictor(TimeDelta max_dns_queue_delay,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   bool prefetching_enabled =
-      user_prefs->GetBoolean(prefs::kDnsPrefetchingEnabled);
+      user_prefs->GetBoolean(prefs::kNetworkPredictionEnabled);
 
   // Gather the list of hostnames to prefetch on startup.
   UrlList urls =
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index 2683939..17f18d1 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -168,7 +168,7 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
   { Value::TYPE_BOOLEAN, kPolicySearchSuggestEnabled,
     prefs::kSearchSuggestEnabled },
   { Value::TYPE_BOOLEAN, kPolicyDnsPrefetchingEnabled,
-    prefs::kDnsPrefetchingEnabled },
+    prefs::kNetworkPredictionEnabled },
   { Value::TYPE_BOOLEAN, kPolicyDisableSpdy,
     prefs::kDisableSpdy },
   { Value::TYPE_BOOLEAN, kPolicySafeBrowsingEnabled,
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index aad6030..ab54828 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -165,7 +165,7 @@ INSTANTIATE_TEST_CASE_P(
         TypeAndName(kPolicySearchSuggestEnabled,
                     prefs::kSearchSuggestEnabled),
         TypeAndName(kPolicyDnsPrefetchingEnabled,
-                    prefs::kDnsPrefetchingEnabled),
+                    prefs::kNetworkPredictionEnabled),
         TypeAndName(kPolicyDisableSpdy,
                     prefs::kDisableSpdy),
         TypeAndName(kPolicySafeBrowsingEnabled,
diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc
index 4b82ae3..c223f07 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.cc
+++ b/chrome/browser/policy/managed_prefs_banner_base.cc
@@ -85,7 +85,7 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,
     case OPTIONS_PAGE_ADVANCED:
       AddUserPref(prefs::kAlternateErrorPagesEnabled);
       AddUserPref(prefs::kSearchSuggestEnabled);
-      AddUserPref(prefs::kDnsPrefetchingEnabled);
+      AddUserPref(prefs::kNetworkPredictionEnabled);
       AddUserPref(prefs::kDisableSpdy);
       AddUserPref(prefs::kSafeBrowsingEnabled);
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 6507261..a8147bb 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -35,7 +35,7 @@
         <label>
           <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
               metric="Options_DnsPrefetchCheckbox" type="checkbox">
-          <span i18n-content="networkDNSPrefetchEnabledDescription"></span>
+          <span i18n-content="networkPredictionEnabledDescription"></span>
         </label>
       </div>
       <div class="checkbox">
diff --git a/chrome/browser/sync/glue/synchronized_preferences.h b/chrome/browser/sync/glue/synchronized_preferences.h
index 58418fa..b9429c3 100644
--- a/chrome/browser/sync/glue/synchronized_preferences.h
+++ b/chrome/browser/sync/glue/synchronized_preferences.h
@@ -76,7 +76,7 @@ static const char* kSynchronizedPreferences[] = {
   // Options dialog: Under the hood.
   prefs::kAlternateErrorPagesEnabled,
   prefs::kSearchSuggestEnabled,
-  prefs::kDnsPrefetchingEnabled,
+  prefs::kNetworkPredictionEnabled,
   prefs::kSafeBrowsingEnabled,
   prefs::kEnableTranslate,
   // Download directory not synced.
diff --git a/chrome/browser/ui/options/options_util.cc b/chrome/browser/ui/options/options_util.cc
index 19f5742..590c093 100644
--- a/chrome/browser/ui/options/options_util.cc
+++ b/chrome/browser/ui/options/options_util.cc
@@ -37,7 +37,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
     prefs::kDeleteDownloadHistory,
     prefs::kDeleteFormData,
     prefs::kDeletePasswords,
-    prefs::kDnsPrefetchingEnabled,
+    prefs::kNetworkPredictionEnabled,
     // TODO(rtenneti): Remove ssl preferences from user_prefs when we stop
     // migrating user_prefs to local_state after 6 months (after we delete
     // migration code).
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index dbac6d5..6628a42 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -98,8 +98,8 @@ void AdvancedOptionsHandler::GetLocalizedValues(
       IDS_OPTIONS_SSL_USESSL3 },
     { "sslUseTLS1",
       IDS_OPTIONS_SSL_USETLS1 },
-    { "networkDNSPrefetchEnabledDescription",
-      IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION },
+    { "networkPredictionEnabledDescription",
+      IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
     { "privacyContentSettingsButton",
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
     { "privacyClearDataButton",
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 13afcda..8b10513 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -230,9 +230,6 @@ const char kPromptForDownload[] = "download.prompt_for_download";
 // A boolean pref set to true if we're using Link Doctor error pages.
 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled";
 
-// A boolean pref set to true if DNS pre-fetching is being done in browser.
-const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled";
-
 // OBSOLETE: new pref now stored with user prefs instead of profile, as
 // kDnsPrefetchingStartupList.
 const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
@@ -281,6 +278,13 @@ const char kInstantPromo[] = "instant.promo";
 const char kMultipleProfilePrefMigration[] =
     "local_state.multiple_profile_prefs_version";
 
+// A boolean pref set to true if prediction of network actions is allowed.
+// Actions include DNS prefetching, TCP and SSL preconnection, and prerendering
+// of web pages.
+// NOTE: The "dns_prefetching.enabled" value is used so that historical user
+// preferences are not lost.
+const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
+
 #if defined(OS_CHROMEOS)
 // An integer pref to initially mute volume if 1.
 const char kAudioMute[] = "settings.audio.mute";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 4899cde..bc65772 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -81,7 +81,6 @@ extern const char kSearchProviderOverrides[];
 extern const char kSearchProviderOverridesVersion[];
 extern const char kPromptForDownload[];
 extern const char kAlternateErrorPagesEnabled[];
-extern const char kDnsPrefetchingEnabled[];
 extern const char kDnsStartupPrefetchList[];  // OBSOLETE
 extern const char kDnsPrefetchingStartupList[];
 extern const char kDnsHostReferralList[];  // OBSOLETE
@@ -93,6 +92,7 @@ extern const char kInstantEnabledOnce[];
 extern const char kInstantEnabledTime[];
 extern const char kInstantPromo[];
 extern const char kMultipleProfilePrefMigration[];
+extern const char kNetworkPredictionEnabled[];
 #if defined(OS_CHROMEOS)
 extern const char kAudioMute[];
 extern const char kAudioVolume[];
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index c874dbc..c484e72 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -488,18 +488,20 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG));
     error_strings->Set("suggestionsDNSConfig", suggest_dns_config);
 
-    DictionaryValue* suggest_dns_prefetch = new DictionaryValue;
-    suggest_dns_prefetch->SetString("msg",
-        l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH));
-    suggest_dns_prefetch->SetString("settingsTitle",
+    DictionaryValue* suggest_network_prediction = new DictionaryValue;
+    suggest_network_prediction->SetString("msg",
+        l10n_util::GetStringUTF16(
+            IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION));
+    suggest_network_prediction->SetString("settingsTitle",
         l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
-    suggest_dns_prefetch->SetString("advancedTitle",
+    suggest_network_prediction->SetString("advancedTitle",
         l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL));
-    suggest_dns_prefetch->SetString(
-        "noPrefetchTitle",
+    suggest_network_prediction->SetString(
+        "noNetworkPredictionTitle",
         l10n_util::GetStringUTF16(
-            IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION));
-    error_strings->Set("suggestionsDisableDNSPrefetch", suggest_dns_prefetch);
+            IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION));
+    error_strings->Set("suggestionsDisableNetworkPrediction",
+                       suggest_network_prediction);
   }
 
   if (options.suggestions & SUGGEST_FIREWALL_CONFIG) {
diff --git a/chrome/renderer/resources/neterror.html b/chrome/renderer/resources/neterror.html
index a0ccff4..dd456af 100644
--- a/chrome/renderer/resources/neterror.html
+++ b/chrome/renderer/resources/neterror.html
@@ -166,7 +166,7 @@ if (window.screen.colorDepth >= 24)
     <li jsselect="suggestionsDNSConfig">
       <span jsvalues=".innerHTML:msg"></span>
     </li>
-    <li jsselect="suggestionsDisableDNSPrefetch">
+    <li jsselect="suggestionsDisableNetworkPrediction">
       <span jsvalues=".innerHTML:msg"></span>
     </li>
     <li jsselect="suggestionsFirewallConfig">
diff --git a/chrome/test/functional/enterprise.py b/chrome/test/functional/enterprise.py
index 17d9999..0dc5b26 100644
--- a/chrome/test/functional/enterprise.py
+++ b/chrome/test/functional/enterprise.py
@@ -139,7 +139,7 @@ class EnterpriseTest(pyauto.PyUITest):
         # (preference key, default value, new value)

         (pyauto.kAlternateErrorPagesEnabled, True, False),

         (pyauto.kAutofillEnabled, False, True),

-        (pyauto.kDnsPrefetchingEnabled, True, False),

+        (pyauto.kNetworkPredictionEnabled, True, False),

         (pyauto.kSafeBrowsingEnabled, True, False),

         (pyauto.kSearchSuggestEnabled, True, False),

         ]

diff --git a/chrome/test/functional/prefs.py b/chrome/test/functional/prefs.py
index d27db89..998f756 100644
--- a/chrome/test/functional/prefs.py
+++ b/chrome/test/functional/prefs.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -114,13 +114,14 @@ class PrefsTest(pyauto.PyUITest):
     self.RestartBrowser(clear_profile=False)
     self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
 
-  def testDnsPrefetchingEnabledPref(self):
+  def testNetworkPredictionEnabledPref(self):
     """Verify DNS prefetching pref."""
     # Assert default
-    self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kDnsPrefetchingEnabled))
-    self.SetPrefs(pyauto.kDnsPrefetchingEnabled, False)
+    self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kNetworkPredictionEnabled))
+    self.SetPrefs(pyauto.kNetworkPredictionEnabled, False)
     self.RestartBrowser(clear_profile=False)
-    self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kDnsPrefetchingEnabled))
+    self.assertFalse(self.GetPrefsInfo().Prefs(
+        pyauto.kNetworkPredictionEnabled))
 
   def testHomepagePrefs(self):
     """Verify homepage prefs."""
@@ -163,7 +164,7 @@ class PrefsTest(pyauto.PyUITest):
   def testUnderTheHoodPref(self):
     """Verify the security preferences for Under the Hood.
     The setting is enabled by default."""
-    pref_list = [pyauto.kDnsPrefetchingEnabled, pyauto.kSafeBrowsingEnabled,
+    pref_list = [pyauto.kNetworkPredictionEnabled, pyauto.kSafeBrowsingEnabled,
                  pyauto.kAlternateErrorPagesEnabled,
                  pyauto.kSearchSuggestEnabled, pyauto.kShowOmniboxSearchHint]
     for pref in pref_list:
diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
index f6fbbdf..0607123 100644
--- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
@@ -364,8 +364,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) {
             GetPrefs(1)->GetBoolean(prefs::kAlternateErrorPagesEnabled));
   ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled),
             GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled));
-  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kDnsPrefetchingEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kDnsPrefetchingEnabled));
+  ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kNetworkPredictionEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kNetworkPredictionEnabled));
   ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled),
             GetPrefs(1)->GetBoolean(prefs::kSafeBrowsingEnabled));
 
@@ -373,8 +373,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) {
       prefs::kAlternateErrorPagesEnabled);
   bool new_kSearchSuggestEnabled = !GetVerifierPrefs()->GetBoolean(
       prefs::kSearchSuggestEnabled);
-  bool new_kDnsPrefetchingEnabled = !GetVerifierPrefs()->GetBoolean(
-      prefs::kDnsPrefetchingEnabled);
+  bool new_kNetworkPredictionEnabled = !GetVerifierPrefs()->GetBoolean(
+      prefs::kNetworkPredictionEnabled);
   bool new_kSafeBrowsingEnabled = !GetVerifierPrefs()->GetBoolean(
       prefs::kSafeBrowsingEnabled);
 
@@ -386,10 +386,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) {
       new_kSearchSuggestEnabled);
   GetPrefs(0)->SetBoolean(prefs::kSearchSuggestEnabled,
       new_kSearchSuggestEnabled);
-  GetVerifierPrefs()->SetBoolean(prefs::kDnsPrefetchingEnabled,
-      new_kDnsPrefetchingEnabled);
-  GetPrefs(0)->SetBoolean(prefs::kDnsPrefetchingEnabled,
-      new_kDnsPrefetchingEnabled);
+  GetVerifierPrefs()->SetBoolean(prefs::kNetworkPredictionEnabled,
+      new_kNetworkPredictionEnabled);
+  GetPrefs(0)->SetBoolean(prefs::kNetworkPredictionEnabled,
+      new_kNetworkPredictionEnabled);
   GetVerifierPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled,
       new_kSafeBrowsingEnabled);
   GetPrefs(0)->SetBoolean(prefs::kSafeBrowsingEnabled,
@@ -404,10 +404,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Privacy) {
             GetPrefs(0)->GetBoolean(prefs::kSearchSuggestEnabled));
   ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSearchSuggestEnabled),
             GetPrefs(1)->GetBoolean(prefs::kSearchSuggestEnabled));
-  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kDnsPrefetchingEnabled),
-            GetPrefs(0)->GetBoolean(prefs::kDnsPrefetchingEnabled));
-  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kDnsPrefetchingEnabled),
-            GetPrefs(1)->GetBoolean(prefs::kDnsPrefetchingEnabled));
+  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kNetworkPredictionEnabled),
+            GetPrefs(0)->GetBoolean(prefs::kNetworkPredictionEnabled));
+  ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kNetworkPredictionEnabled),
+            GetPrefs(1)->GetBoolean(prefs::kNetworkPredictionEnabled));
   ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),
             GetPrefs(0)->GetBoolean(prefs::kSafeBrowsingEnabled));
   ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled),