Add more per-tab preferences.

chrome/browser/browser_encoding_uitest.cc

 // 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.
 #include <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 231 matching lines @@
   // Full path of saved file. full_file_name = save_dir_ + file_name[i];
   FilePath full_saved_file_name;
 
   FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAutoDetectDir);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   // 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.
-  ASSERT_TRUE(browser->SetStringPreference(prefs::kDefaultCharset,
+  ASSERT_TRUE(browser->SetStringPreference(prefs::kGlobalDefaultCharset,
                                            "ISO-8859-4"));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas);i++) {
     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);
     ASSERT_TRUE(tab->NavigateToURL(url));
@@ skipping 32 matching lines @@
     expected_result_file_name = expected_result_file_name.AppendASCII(
         kExpectedResultDir);
     expected_result_file_name = expected_result_file_name.AppendASCII(
         kTestDatas[i].expected_result);
     EXPECT_TRUE(tab->SavePage(full_saved_file_name, temp_sub_resource_dir_,
                               SavePackage::SAVE_AS_COMPLETE_HTML));
     EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
     CheckFile(full_saved_file_name, expected_result_file_name, true);
   }
 }