Add more per-tab preferences.

chrome/browser/sync/test/integration/two_client_preferences_sync_test.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 "base/values.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/common/pref_names.h"
@@ skipping 342 matching lines @@
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kWebKitUsesUniversalDetector));
 
   ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kWebKitUsesUniversalDetector));
 }
 
 // TCM ID - 3673298.
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kDefaultCharset) {
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kGlobalDefaultCharset) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
+  ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset));
 
-  ChangeStringPref(0, prefs::kDefaultCharset, "Thai");
+  ChangeStringPref(0, prefs::kGlobalDefaultCharset, "Thai");
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
+  ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset));
 }
 
 // TCM ID - 3653296.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        kBlockThirdPartyCookies) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kBlockThirdPartyCookies));
 
   ChangeBooleanPref(0, prefs::kBlockThirdPartyCookies);
@@ skipping 301 matching lines @@
   ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
   ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
   ASSERT_TRUE(BooleanPrefMatches(
       prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }