Migrate the rest of the "global" prefs.

chrome/test/functional/prefs.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 pyauto_functional  # Must be imported before pyauto
@@ skipping 170 matching lines @@
       # 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(pyauto.kWebKitGlobalJavascriptEnabled))
+        self.GetPrefsInfo().Prefs(pyauto.kWebKitJavascriptEnabled))
     url = self.GetFileURLForDataPath(
               os.path.join('javaScriptTitle.html'))
     title1 = 'Title from script javascript enabled'
     self.NavigateToURL(url)
     self.assertEqual(title1, self.GetActiveTabTitle())
-    self.SetPrefs(pyauto.kWebKitGlobalJavascriptEnabled, False)
+    self.SetPrefs(pyauto.kWebKitJavascriptEnabled, False)
     title = 'This is html title'
     self.NavigateToURL(url)
     self.assertEqual(title, self.GetActiveTabTitle())
 
   def testHaveLocalStatePrefs(self):
     """Verify that we have some Local State prefs."""
     self.assertTrue(self.GetLocalStatePrefsInfo())
 
   def testAllowSelectedGeoTracking(self):
     """Verify hostname pattern and behavior for allowed tracking."""
@@ skipping 134 matching lines @@
             self, self.INFOBAR_TYPE))
     driver = self.NewWebDriver()
     driver.find_element_by_id('test_protocol').click()
     self.assertTrue(
         driver.execute_script('return verifyQueryConformsToProtocol();'),
         msg='Protocol did not register correctly.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()