Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2438)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/pref_service_syncable_unittest.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/prefs/pref_service_syncable.h ('K') | « chrome/browser/prefs/pref_service_syncable_factory.cc ('k') | chrome/browser/prefs/pref_service_syncable_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service_syncable_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_syncable_unittest.cc b/chrome/browser/prefs/pref_service_syncable_unittest.cc
index 7cfe32986b9bc069cd3c934201cb40385da9df44..fcfa948a51f423fd06d6456e9be0eb290120e2e4 100644
--- a/chrome/browser/prefs/pref_service_syncable_unittest.cc
+++ b/chrome/browser/prefs/pref_service_syncable_unittest.cc
@@ -11,8 +11,7 @@
#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/prefs/pref_model_associator.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/grit/locale_settings.h"
+#include "chrome/browser/prefs/pref_model_associator_client.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "sync/api/attachments/attachment_id.h"
@@ -24,7 +23,6 @@
#include "sync/protocol/preference_specifics.pb.h"
#include "sync/protocol/sync.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util.h"
using syncer::SyncChange;
using syncer::SyncData;
@@ -33,9 +31,15 @@ namespace {
const char kExampleUrl0[] = "http://example.com/0";
const char kExampleUrl1[] = "http://example.com/1";
const char kExampleUrl2[] = "http://example.com/2";
+
const char kUnsyncedPreferenceName[] = "nonsense_pref_name";
const char kUnsyncedPreferenceDefaultValue[] = "default";
const char kNonDefaultCharsetValue[] = "foo";
+const char kDefaultCharsetValue[] = "utf-8";
+
+const char kDefaultCharset[] = "intl.charset_default";
+const char kHomePage[] = "homepage";
+const char kURLsToRestoreOnStartup[] = "session.startup_urls";
} // namespace
class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
@@ -56,13 +60,12 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
return syncer::SyncError();
}
- void FailNextProcessSyncChanges() {
- fail_next_ = true;
- }
+ void FailNextProcessSyncChanges() { fail_next_ = true; }
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
return syncer::SyncDataList();
}
+
private:
syncer::SyncChangeList* output_;
bool fail_next_;
@@ -76,18 +79,22 @@ class PrefServiceSyncableTest : public testing::Test {
next_pref_remote_sync_node_id_(0) {}
void SetUp() override {
+ pref_model_associator_client_.RegisterPreference(
+ kURLsToRestoreOnStartup, PREF_MODEL_PREFERENCE_TYPE_LIST);
+ prefs_.SetPrefModelAssociatorClient(&pref_model_associator_client_);
+
prefs_.registry()->RegisterStringPref(kUnsyncedPreferenceName,
kUnsyncedPreferenceDefaultValue);
prefs_.registry()->RegisterStringPref(
- prefs::kHomePage,
+ kHomePage,
std::string(),
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
prefs_.registry()->RegisterListPref(
- prefs::kURLsToRestoreOnStartup,
+ kURLsToRestoreOnStartup,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
prefs_.registry()->RegisterStringPref(
- prefs::kDefaultCharset,
- l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING),
+ kDefaultCharset,
+ kDefaultCharsetValue,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
@@ -96,11 +103,10 @@ class PrefServiceSyncableTest : public testing::Test {
next_pref_remote_sync_node_id_ = 0;
}
- syncer::SyncChange MakeRemoteChange(
- int64 id,
- const std::string& name,
- const base::Value& value,
- SyncChange::SyncChangeType type) {
+ syncer::SyncChange MakeRemoteChange(int64 id,
+ const std::string& name,
+ const base::Value& value,
+ SyncChange::SyncChangeType type) {
std::string serialized;
JSONStringValueSerializer json(&serialized);
if (!json.Serialize(value))
@@ -160,7 +166,7 @@ class PrefServiceSyncableTest : public testing::Test {
}
scoped_ptr<base::Value> FindValue(const std::string& name,
- const syncer::SyncChangeList& list) {
+ const syncer::SyncChangeList& list) {
syncer::SyncChangeList::const_iterator it = list.begin();
for (; it != list.end(); ++it) {
if (syncer::SyncDataLocal(it->sync_data()).GetTag() == name) {
@@ -183,6 +189,7 @@ class PrefServiceSyncableTest : public testing::Test {
TestingPrefServiceSyncable* GetTestingPrefService() { return &prefs_; }
protected:
+ PrefModelAssociatorClient pref_model_associator_client_;
TestingPrefServiceSyncable prefs_;
PrefModelAssociator* pref_sync_service_;
@@ -195,39 +202,36 @@ class PrefServiceSyncableTest : public testing::Test {
};
TEST_F(PrefServiceSyncableTest, CreatePrefSyncData) {
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
+ prefs_.SetString(kHomePage, kExampleUrl0);
- const PrefService::Preference* pref =
- prefs_.FindPreference(prefs::kHomePage);
+ const PrefService::Preference* pref = prefs_.FindPreference(kHomePage);
syncer::SyncData sync_data;
- EXPECT_TRUE(pref_sync_service_->CreatePrefSyncData(pref->name(),
- *pref->GetValue(), &sync_data));
- EXPECT_EQ(std::string(prefs::kHomePage),
- syncer::SyncDataLocal(sync_data).GetTag());
- const sync_pb::PreferenceSpecifics& specifics(sync_data.GetSpecifics().
- preference());
- EXPECT_EQ(std::string(prefs::kHomePage), specifics.name());
+ EXPECT_TRUE(pref_sync_service_->CreatePrefSyncData(
+ pref->name(), *pref->GetValue(), &sync_data));
+ EXPECT_EQ(std::string(kHomePage), syncer::SyncDataLocal(sync_data).GetTag());
+ const sync_pb::PreferenceSpecifics& specifics(
+ sync_data.GetSpecifics().preference());
+ EXPECT_EQ(std::string(kHomePage), specifics.name());
scoped_ptr<base::Value> value = base::JSONReader::Read(specifics.value());
EXPECT_TRUE(pref->GetValue()->Equals(value.get()));
}
TEST_F(PrefServiceSyncableTest, ModelAssociationDoNotSyncDefaults) {
- const PrefService::Preference* pref =
- prefs_.FindPreference(prefs::kHomePage);
+ const PrefService::Preference* pref = prefs_.FindPreference(kHomePage);
EXPECT_TRUE(pref->IsDefaultValue());
syncer::SyncChangeList out;
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
- EXPECT_TRUE(IsSynced(prefs::kHomePage));
+ EXPECT_TRUE(IsSynced(kHomePage));
EXPECT_TRUE(pref->IsDefaultValue());
- EXPECT_FALSE(FindValue(prefs::kHomePage, out).get());
+ EXPECT_FALSE(FindValue(kHomePage, out).get());
}
TEST_F(PrefServiceSyncableTest, ModelAssociationEmptyCloud) {
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
+ prefs_.SetString(kHomePage, kExampleUrl0);
{
- ListPrefUpdate update(GetPrefs(), prefs::kURLsToRestoreOnStartup);
+ ListPrefUpdate update(GetPrefs(), kURLsToRestoreOnStartup);
base::ListValue* url_list = update.Get();
url_list->Append(new base::StringValue(kExampleUrl0));
url_list->Append(new base::StringValue(kExampleUrl1));
@@ -235,19 +239,18 @@ TEST_F(PrefServiceSyncableTest, ModelAssociationEmptyCloud) {
syncer::SyncChangeList out;
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
- scoped_ptr<base::Value> value(FindValue(prefs::kHomePage, out));
+ scoped_ptr<base::Value> value(FindValue(kHomePage, out));
ASSERT_TRUE(value.get());
- EXPECT_TRUE(GetPreferenceValue(prefs::kHomePage).Equals(value.get()));
- value = FindValue(prefs::kURLsToRestoreOnStartup, out).Pass();
+ EXPECT_TRUE(GetPreferenceValue(kHomePage).Equals(value.get()));
+ value = FindValue(kURLsToRestoreOnStartup, out).Pass();
ASSERT_TRUE(value.get());
- EXPECT_TRUE(
- GetPreferenceValue(prefs::kURLsToRestoreOnStartup).Equals(value.get()));
+ EXPECT_TRUE(GetPreferenceValue(kURLsToRestoreOnStartup).Equals(value.get()));
}
TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) {
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
+ prefs_.SetString(kHomePage, kExampleUrl0);
{
- ListPrefUpdate update(GetPrefs(), prefs::kURLsToRestoreOnStartup);
+ ListPrefUpdate update(GetPrefs(), kURLsToRestoreOnStartup);
base::ListValue* url_list = update.Get();
url_list->Append(new base::StringValue(kExampleUrl0));
url_list->Append(new base::StringValue(kExampleUrl1));
@@ -255,33 +258,30 @@ TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) {
syncer::SyncDataList in;
syncer::SyncChangeList out;
- AddToRemoteDataList(prefs::kHomePage, base::StringValue(kExampleUrl1), &in);
+ AddToRemoteDataList(kHomePage, base::StringValue(kExampleUrl1), &in);
base::ListValue urls_to_restore;
urls_to_restore.Append(new base::StringValue(kExampleUrl1));
urls_to_restore.Append(new base::StringValue(kExampleUrl2));
- AddToRemoteDataList(prefs::kURLsToRestoreOnStartup, urls_to_restore, &in);
- AddToRemoteDataList(prefs::kDefaultCharset,
- base::StringValue(kNonDefaultCharsetValue),
- &in);
+ AddToRemoteDataList(kURLsToRestoreOnStartup, urls_to_restore, &in);
+ AddToRemoteDataList(kDefaultCharset,
+ base::StringValue(kNonDefaultCharsetValue), &in);
InitWithSyncDataTakeOutput(in, &out);
- ASSERT_FALSE(FindValue(prefs::kHomePage, out).get());
- ASSERT_FALSE(FindValue(prefs::kDefaultCharset, out).get());
+ ASSERT_FALSE(FindValue(kHomePage, out).get());
+ ASSERT_FALSE(FindValue(kDefaultCharset, out).get());
- EXPECT_EQ(kExampleUrl1, prefs_.GetString(prefs::kHomePage));
+ EXPECT_EQ(kExampleUrl1, prefs_.GetString(kHomePage));
scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
expected_urls->Append(new base::StringValue(kExampleUrl1));
expected_urls->Append(new base::StringValue(kExampleUrl2));
expected_urls->Append(new base::StringValue(kExampleUrl0));
- scoped_ptr<base::Value> value(
- FindValue(prefs::kURLsToRestoreOnStartup, out));
+ scoped_ptr<base::Value> value(FindValue(kURLsToRestoreOnStartup, out));
ASSERT_TRUE(value.get());
EXPECT_TRUE(value->Equals(expected_urls.get()));
- EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
- Equals(expected_urls.get()));
- EXPECT_EQ(kNonDefaultCharsetValue,
- prefs_.GetString(prefs::kDefaultCharset));
+ EXPECT_TRUE(
+ GetPreferenceValue(kURLsToRestoreOnStartup).Equals(expected_urls.get()));
+ EXPECT_EQ(kNonDefaultCharsetValue, prefs_.GetString(kDefaultCharset));
}
TEST_F(PrefServiceSyncableTest, FailModelAssociation) {
@@ -291,14 +291,12 @@ TEST_F(PrefServiceSyncableTest, FailModelAssociation) {
syncer::SyncMergeResult r = pref_sync_service_->MergeDataAndStartSyncing(
syncer::PREFERENCES, syncer::SyncDataList(),
scoped_ptr<syncer::SyncChangeProcessor>(stub),
- scoped_ptr<syncer::SyncErrorFactory>(
- new syncer::SyncErrorFactoryMock()));
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
EXPECT_TRUE(r.error().IsSet());
}
TEST_F(PrefServiceSyncableTest, UpdatedPreferenceWithDefaultValue) {
- const PrefService::Preference* pref =
- prefs_.FindPreference(prefs::kHomePage);
+ const PrefService::Preference* pref = prefs_.FindPreference(kHomePage);
EXPECT_TRUE(pref->IsDefaultValue());
syncer::SyncChangeList out;
@@ -306,38 +304,38 @@ TEST_F(PrefServiceSyncableTest, UpdatedPreferenceWithDefaultValue) {
out.clear();
base::StringValue expected(kExampleUrl0);
- GetPrefs()->Set(prefs::kHomePage, expected);
+ GetPrefs()->Set(kHomePage, expected);
- scoped_ptr<base::Value> actual(FindValue(prefs::kHomePage, out));
+ scoped_ptr<base::Value> actual(FindValue(kHomePage, out));
ASSERT_TRUE(actual.get());
EXPECT_TRUE(expected.Equals(actual.get()));
}
TEST_F(PrefServiceSyncableTest, UpdatedPreferenceWithValue) {
- GetPrefs()->SetString(prefs::kHomePage, kExampleUrl0);
+ GetPrefs()->SetString(kHomePage, kExampleUrl0);
syncer::SyncChangeList out;
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
out.clear();
base::StringValue expected(kExampleUrl1);
- GetPrefs()->Set(prefs::kHomePage, expected);
+ GetPrefs()->Set(kHomePage, expected);
- scoped_ptr<base::Value> actual(FindValue(prefs::kHomePage, out));
+ scoped_ptr<base::Value> actual(FindValue(kHomePage, out));
ASSERT_TRUE(actual.get());
EXPECT_TRUE(expected.Equals(actual.get()));
}
TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionUpdate) {
- GetPrefs()->SetString(prefs::kHomePage, kExampleUrl0);
+ GetPrefs()->SetString(kHomePage, kExampleUrl0);
InitWithNoSyncData();
base::StringValue expected(kExampleUrl1);
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kHomePage, expected, SyncChange::ACTION_UPDATE));
+ list.push_back(
+ MakeRemoteChange(1, kHomePage, expected, SyncChange::ACTION_UPDATE));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
- const base::Value& actual = GetPreferenceValue(prefs::kHomePage);
+ const base::Value& actual = GetPreferenceValue(kHomePage);
EXPECT_TRUE(expected.Equals(&actual));
}
@@ -346,14 +344,13 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionAdd) {
base::StringValue expected(kExampleUrl0);
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kHomePage, expected, SyncChange::ACTION_ADD));
+ list.push_back(
+ MakeRemoteChange(1, kHomePage, expected, SyncChange::ACTION_ADD));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
- const base::Value& actual = GetPreferenceValue(prefs::kHomePage);
+ const base::Value& actual = GetPreferenceValue(kHomePage);
EXPECT_TRUE(expected.Equals(&actual));
- EXPECT_EQ(1U,
- pref_sync_service_->registered_preferences().count(prefs::kHomePage));
+ EXPECT_EQ(1U, pref_sync_service_->registered_preferences().count(kHomePage));
}
TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeUnknownPreference) {
@@ -370,7 +367,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeUnknownPreference) {
TEST_F(PrefServiceSyncableTest, ManagedPreferences) {
// Make the homepage preference managed.
base::StringValue managed_value("http://example.com");
- prefs_.SetManagedPref(prefs::kHomePage, managed_value.DeepCopy());
+ prefs_.SetManagedPref(kHomePage, managed_value.DeepCopy());
syncer::SyncChangeList out;
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
@@ -378,19 +375,19 @@ TEST_F(PrefServiceSyncableTest, ManagedPreferences) {
// Changing the homepage preference should not sync anything.
base::StringValue user_value("http://chromium..com");
- prefs_.SetUserPref(prefs::kHomePage, user_value.DeepCopy());
+ prefs_.SetUserPref(kHomePage, user_value.DeepCopy());
EXPECT_TRUE(out.empty());
// An incoming sync transaction should change the user value, not the managed
// value.
base::StringValue sync_value("http://crbug.com");
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kHomePage, sync_value, SyncChange::ACTION_UPDATE));
+ list.push_back(
+ MakeRemoteChange(1, kHomePage, sync_value, SyncChange::ACTION_UPDATE));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_TRUE(managed_value.Equals(prefs_.GetManagedPref(prefs::kHomePage)));
- EXPECT_TRUE(sync_value.Equals(prefs_.GetUserPref(prefs::kHomePage)));
+ EXPECT_TRUE(managed_value.Equals(prefs_.GetManagedPref(kHomePage)));
+ EXPECT_TRUE(sync_value.Equals(prefs_.GetUserPref(kHomePage)));
}
// List preferences have special handling at association time due to our ability
@@ -401,8 +398,7 @@ TEST_F(PrefServiceSyncableTest, ManagedListPreferences) {
base::ListValue managed_value;
managed_value.Append(new base::StringValue(kExampleUrl0));
managed_value.Append(new base::StringValue(kExampleUrl1));
- prefs_.SetManagedPref(prefs::kURLsToRestoreOnStartup,
- managed_value.DeepCopy());
+ prefs_.SetManagedPref(kURLsToRestoreOnStartup, managed_value.DeepCopy());
// Set a cloud version.
syncer::SyncDataList in;
@@ -410,34 +406,32 @@ TEST_F(PrefServiceSyncableTest, ManagedListPreferences) {
base::ListValue urls_to_restore;
urls_to_restore.Append(new base::StringValue(kExampleUrl1));
urls_to_restore.Append(new base::StringValue(kExampleUrl2));
- AddToRemoteDataList(prefs::kURLsToRestoreOnStartup, urls_to_restore, &in);
+ AddToRemoteDataList(kURLsToRestoreOnStartup, urls_to_restore, &in);
// Start sync and verify the synced value didn't get merged.
InitWithSyncDataTakeOutput(in, &out);
- EXPECT_FALSE(FindValue(prefs::kURLsToRestoreOnStartup, out).get());
+ EXPECT_FALSE(FindValue(kURLsToRestoreOnStartup, out).get());
out.clear();
// Changing the user's urls to restore on startup pref should not sync
// anything.
base::ListValue user_value;
user_value.Append(new base::StringValue("http://chromium.org"));
- prefs_.SetUserPref(prefs::kURLsToRestoreOnStartup, user_value.DeepCopy());
- EXPECT_FALSE(FindValue(prefs::kURLsToRestoreOnStartup, out).get());
+ prefs_.SetUserPref(kURLsToRestoreOnStartup, user_value.DeepCopy());
+ EXPECT_FALSE(FindValue(kURLsToRestoreOnStartup, out).get());
// An incoming sync transaction should change the user value, not the managed
// value.
base::ListValue sync_value;
sync_value.Append(new base::StringValue("http://crbug.com"));
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kURLsToRestoreOnStartup, sync_value,
- SyncChange::ACTION_UPDATE));
+ list.push_back(MakeRemoteChange(1, kURLsToRestoreOnStartup, sync_value,
+ SyncChange::ACTION_UPDATE));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_TRUE(managed_value.Equals(
- prefs_.GetManagedPref(prefs::kURLsToRestoreOnStartup)));
- EXPECT_TRUE(sync_value.Equals(
- prefs_.GetUserPref(prefs::kURLsToRestoreOnStartup)));
+ EXPECT_TRUE(
+ managed_value.Equals(prefs_.GetManagedPref(kURLsToRestoreOnStartup)));
+ EXPECT_TRUE(sync_value.Equals(prefs_.GetUserPref(kURLsToRestoreOnStartup)));
}
TEST_F(PrefServiceSyncableTest, DynamicManagedPreferences) {
@@ -445,24 +439,23 @@ TEST_F(PrefServiceSyncableTest, DynamicManagedPreferences) {
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
out.clear();
base::StringValue initial_value("http://example.com/initial");
- GetPrefs()->Set(prefs::kHomePage, initial_value);
- scoped_ptr<base::Value> actual(FindValue(prefs::kHomePage, out));
+ GetPrefs()->Set(kHomePage, initial_value);
+ scoped_ptr<base::Value> actual(FindValue(kHomePage, out));
ASSERT_TRUE(actual.get());
EXPECT_TRUE(initial_value.Equals(actual.get()));
// Switch kHomePage to managed and set a different value.
base::StringValue managed_value("http://example.com/managed");
- GetTestingPrefService()->SetManagedPref(prefs::kHomePage,
- managed_value.DeepCopy());
+ GetTestingPrefService()->SetManagedPref(kHomePage, managed_value.DeepCopy());
// The pref value should be the one dictated by policy.
- EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(prefs::kHomePage)));
+ EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(kHomePage)));
// Switch kHomePage back to unmanaged.
- GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
+ GetTestingPrefService()->RemoveManagedPref(kHomePage);
// The original value should be picked up.
- EXPECT_TRUE(initial_value.Equals(&GetPreferenceValue(prefs::kHomePage)));
+ EXPECT_TRUE(initial_value.Equals(&GetPreferenceValue(kHomePage)));
}
TEST_F(PrefServiceSyncableTest, DynamicManagedPreferencesWithSyncChange) {
@@ -471,73 +464,69 @@ TEST_F(PrefServiceSyncableTest, DynamicManagedPreferencesWithSyncChange) {
out.clear();
base::StringValue initial_value("http://example.com/initial");
- GetPrefs()->Set(prefs::kHomePage, initial_value);
- scoped_ptr<base::Value> actual(FindValue(prefs::kHomePage, out));
+ GetPrefs()->Set(kHomePage, initial_value);
+ scoped_ptr<base::Value> actual(FindValue(kHomePage, out));
EXPECT_TRUE(initial_value.Equals(actual.get()));
// Switch kHomePage to managed and set a different value.
base::StringValue managed_value("http://example.com/managed");
- GetTestingPrefService()->SetManagedPref(prefs::kHomePage,
- managed_value.DeepCopy());
+ GetTestingPrefService()->SetManagedPref(kHomePage, managed_value.DeepCopy());
// Change the sync value.
base::StringValue sync_value("http://example.com/sync");
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kHomePage, sync_value, SyncChange::ACTION_UPDATE));
+ list.push_back(
+ MakeRemoteChange(1, kHomePage, sync_value, SyncChange::ACTION_UPDATE));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
// The pref value should still be the one dictated by policy.
- EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(prefs::kHomePage)));
+ EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(kHomePage)));
// Switch kHomePage back to unmanaged.
- GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
+ GetTestingPrefService()->RemoveManagedPref(kHomePage);
// Sync value should be picked up.
- EXPECT_TRUE(sync_value.Equals(&GetPreferenceValue(prefs::kHomePage)));
+ EXPECT_TRUE(sync_value.Equals(&GetPreferenceValue(kHomePage)));
}
TEST_F(PrefServiceSyncableTest, DynamicManagedDefaultPreferences) {
- const PrefService::Preference* pref =
- prefs_.FindPreference(prefs::kHomePage);
+ const PrefService::Preference* pref = prefs_.FindPreference(kHomePage);
EXPECT_TRUE(pref->IsDefaultValue());
syncer::SyncChangeList out;
InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
- EXPECT_TRUE(IsSynced(prefs::kHomePage));
+ EXPECT_TRUE(IsSynced(kHomePage));
EXPECT_TRUE(pref->IsDefaultValue());
- EXPECT_FALSE(FindValue(prefs::kHomePage, out).get());
+ EXPECT_FALSE(FindValue(kHomePage, out).get());
out.clear();
// Switch kHomePage to managed and set a different value.
base::StringValue managed_value("http://example.com/managed");
- GetTestingPrefService()->SetManagedPref(prefs::kHomePage,
- managed_value.DeepCopy());
+ GetTestingPrefService()->SetManagedPref(kHomePage, managed_value.DeepCopy());
// The pref value should be the one dictated by policy.
- EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(prefs::kHomePage)));
+ EXPECT_TRUE(managed_value.Equals(&GetPreferenceValue(kHomePage)));
EXPECT_FALSE(pref->IsDefaultValue());
// There should be no synced value.
- EXPECT_FALSE(FindValue(prefs::kHomePage, out).get());
+ EXPECT_FALSE(FindValue(kHomePage, out).get());
// Switch kHomePage back to unmanaged.
- GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
+ GetTestingPrefService()->RemoveManagedPref(kHomePage);
// The original value should be picked up.
EXPECT_TRUE(pref->IsDefaultValue());
// There should still be no synced value.
- EXPECT_FALSE(FindValue(prefs::kHomePage, out).get());
+ EXPECT_FALSE(FindValue(kHomePage, out).get());
}
TEST_F(PrefServiceSyncableTest, DeletePreference) {
- prefs_.SetString(prefs::kHomePage, kExampleUrl0);
- const PrefService::Preference* pref =
- prefs_.FindPreference(prefs::kHomePage);
+ prefs_.SetString(kHomePage, kExampleUrl0);
+ const PrefService::Preference* pref = prefs_.FindPreference(kHomePage);
EXPECT_FALSE(pref->IsDefaultValue());
InitWithNoSyncData();
scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
syncer::SyncChangeList list;
- list.push_back(MakeRemoteChange(
- 1, prefs::kHomePage, *null_value, SyncChange::ACTION_DELETE));
+ list.push_back(
+ MakeRemoteChange(1, kHomePage, *null_value, SyncChange::ACTION_DELETE));
pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
EXPECT_TRUE(pref->IsDefaultValue());
}
« chrome/browser/prefs/pref_service_syncable.h ('K') | « chrome/browser/prefs/pref_service_syncable_factory.cc ('k') | chrome/browser/prefs/pref_service_syncable_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698