Change text of DNS prefetch option to Network prediction option.

chrome/test/functional/prefs.py

 #!/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.
 
 import logging
 import os
 import shutil
 import sys
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 94 matching lines @@
     shutil.rmtree(new_dl_dir, ignore_errors=True)  # cleanup
 
   def testToolbarButtonsPref(self):
     """Verify toolbar buttons prefs."""
     # Assert defaults first
     self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
     self.SetPrefs(pyauto.kShowHomeButton, True)
     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."""
     # "Use the New Tab page"
     self.SetPrefs(pyauto.kHomePageIsNewTabPage, True)
     logging.debug('Setting %s to 1' % pyauto.kHomePageIsNewTabPage)
     self.RestartBrowser(clear_profile=False)
     self.assertEqual(self.GetPrefsInfo().Prefs(pyauto.kHomePageIsNewTabPage),
                      True)
     # "Open this page"
@@ skipping 22 matching lines @@
     self.SetPrefs(pyauto.kGeolocationDefaultContentSetting, 2)
     self.assertEqual(2,
         self.GetPrefsInfo().Prefs(pyauto.kGeolocationDefaultContentSetting))
     self.GetBrowserWindow(0).GetTab(0).Reload()
     self.assertTrue(self.WaitForInfobarCount(0))
     self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
 
   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:
       # Verify the default value
       self.assertEqual(self.GetPrefsInfo().Prefs(pref), True)
       self.SetPrefs(pref, False)
     self.RestartBrowser(clear_profile=False)
     for pref in pref_list:
       self.assertEqual(self.GetPrefsInfo().Prefs(pref), False)
 
   def testJavaScriptEnableDisable(self):
     """Verify enabling disabling javascript prefs work """
 
     self.assertTrue(
         self.GetPrefsInfo().Prefs('webkit.webprefs.javascript_enabled'))
     url = self.GetFileURLForDataPath(
               os.path.join('javaScriptTitle.html'))
     title1 = 'Title from script javascript enabled'
     self.NavigateToURL(url)
     self.assertEqual(title1, self.GetActiveTabTitle())
     self.SetPrefs('webkit.webprefs.javascript_enabled', False)
     title = 'This is html title'
     self.NavigateToURL(url)
     self.assertEqual(title, self.GetActiveTabTitle())
 
 if __name__ == '__main__':
   pyauto_functional.Main()