Migrate the rest of the "global" prefs.

chrome/browser/browser_encoding_browsertest.cc

Index: chrome/browser/browser_encoding_browsertest.cc
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index 4379d66f01b5043e504f315cf46fbbd650afd0a8..07f9df77f39db97b9ad02c977ab5aaf9f7909931 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -255,8 +255,8 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
   // Set the default charset to one of encodings not supported by the current
   // auto-detector (Please refer to the above comments) to make sure we
   // incorrectly decode the page. Now we use ISO-8859-4.
-  browser()->profile()->GetPrefs()->SetString(
-      prefs::kGlobalDefaultCharset, "ISO-8859-4");
+  browser()->profile()->GetPrefs()->SetString(prefs::kDefaultCharset,
+                                              "ISO-8859-4");
 
   content::WebContents* web_contents = browser()->GetSelectedWebContents();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas); ++i) {