| Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
|
| index df71e9852cc933dfb34d86c935730d31f63f99dd..5c48c892fb6d7b9a98cbeecf542ea508d9b5d19c 100644
|
| --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
|
| @@ -309,7 +309,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);
|
| @@ -334,13 +334,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);
|
| }
|
|
|
|
|