Migrate the rest of the "global" prefs.

chrome/test/functional/prefs.py

Index: chrome/test/functional/prefs.py
diff --git a/chrome/test/functional/prefs.py b/chrome/test/functional/prefs.py
index ab8de6fd5400bc4eca0f63c4246cc8b3f269a3e0..e7ecf53840f02e5bc0fb46078cfa6451804845f2 100755
--- a/chrome/test/functional/prefs.py
+++ b/chrome/test/functional/prefs.py
@@ -188,13 +188,13 @@ class PrefsTest(pyauto.PyUITest):
   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())