Migrate the rest of the "global" prefs.

chrome/browser/browser_encoding_browsertest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 238 matching lines @@
   const char* const kAutoDetectDir = "auto_detect";
   // Directory of the files of expected results.
   const char* const kExpectedResultDir = "expected_results";
 
   FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAutoDetectDir);
 
   // 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");
+      prefs::kDefaultCharset, "ISO-8859-4");

[Peter Kasting, 2012/05/21 21:37:20]

Nit: Slightly easier to read:

  browser()->profile()->GetPrefs()->SetString(prefs::kDefaultCharset,
                                              "ISO-8859-4");

[falken, 2012/05/22 02:24:21]

Done.

 
   content::WebContents* web_contents = browser()->GetSelectedWebContents();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas); ++i) {
     // Disable auto detect if it is on.
     browser()->profile()->GetPrefs()->SetBoolean(
         prefs::kWebKitUsesUniversalDetector, false);
 
     FilePath test_file_path(test_dir_path);
     test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
     GURL url = URLRequestMockHTTPJob::GetMockUrl(test_file_path);
@@ skipping 17 matching lines @@
     EXPECT_EQ(kTestDatas[i].expected_encoding, web_contents->GetEncoding());
 
     // Dump the page, the content of dump page should be equal with our expect
     // result file.
     FilePath expected_result_file_name =
         FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }