diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 10:35:49 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 10:35:49 +0000 |
| commit | 7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb (patch) | |
| tree | 846e0e2898ea5fac9c772c584ecf5d516c54ce36 /chrome/browser/sync | |
| parent | b7afd53b3c20c8229b3f93a4ecc6bc9aecf6f2cb (diff) | |
| download | chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.zip chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.gz chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.bz2 | |
Add more per-tab preferences.
intl.global.charset_default
webkit.webprefs.global.standard_font_family
webkit.webprefs.global.fixed_font_family
webkit.webprefs.global.serif_font_family
webkit.webprefs.global.sansserif_font_family
webkit.webprefs.global.cursive_font_family
webkit.webprefs.global.fantasy_font_family
webkit.webprefs.global.default_font_size
webkit.webprefs.global.default_fixed_font_size
webkit.webprefs.global.minimum_font_size
webkit.webprefs.global.minimum_logical_font_size
webkit.webprefs.global.javascript_can_open_windows_automatically
webkit.webprefs.global.loads_images_automatically
webkit.webprefs.global.plugins_enabled
BUG=105537
TEST=PrefsTabHelperTest*,PrefsTabHelperBrowserTest*
For files that has only prefs names changes and require OWNERS approval:
TBR=erikwright@chromium.org,gene@chromium.org,csilv@chromium.org,atwilson@chromium.org,mirandac@chromium.org
Review URL: http://codereview.chromium.org/8879016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_preference_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 17fc166f..26dc5e3 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -316,7 +316,7 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationCloudHasData) { urls_to_restore->Append(Value::CreateStringValue(example_url1_)); urls_to_restore->Append(Value::CreateStringValue(example_url2_)); cloud_data[prefs::kURLsToRestoreOnStartup] = urls_to_restore; - cloud_data[prefs::kDefaultCharset] = + cloud_data[prefs::kGlobalDefaultCharset] = Value::CreateStringValue(non_default_charset_value_); AddPreferenceEntriesHelper helper(this, cloud_data); @@ -341,13 +341,13 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationCloudHasData) { EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup). Equals(expected_urls.get())); - value.reset(GetSyncedValue(prefs::kDefaultCharset)); + value.reset(GetSyncedValue(prefs::kGlobalDefaultCharset)); ASSERT_TRUE(value.get()); EXPECT_TRUE(static_cast<const StringValue*>(value.get())-> GetAsString(&string_value)); EXPECT_EQ(non_default_charset_value_, string_value); EXPECT_EQ(non_default_charset_value_, - prefs_->GetString(prefs::kDefaultCharset)); + prefs_->GetString(prefs::kGlobalDefaultCharset)); STLDeleteValues(&cloud_data); } diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc index 81438b5..a850373 100644 --- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc @@ -360,13 +360,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, } // 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. |