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

2 files changed, 8 insertions, 7 deletions

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: