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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/settings/settings_sync_unittest.cc

Issue 9427001: Extend TwoClientExtensionSettingsSyncTest to test app settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops Created 8 years, 10 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/extensions/settings/settings_apitest.cc ('K') | « chrome/browser/extensions/settings/settings_backend.cc ('k') | chrome/browser/extensions/settings/settings_sync_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/settings/settings_sync_unittest.cc
diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc
index bc51b62fdfeab1868496f2381208bd839bca6924..ede73a6e7b8b29e803d3d6270d097089ca2b3ab5 100644
--- a/chrome/browser/extensions/settings/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc
@@ -125,7 +125,8 @@ class MockSyncChangeProcessor : public SyncChangeProcessor {
ADD_FAILURE() << "No matching changes for " << extension_id << "/" <<
key << " (out of " << changes_.size() << ")";
return SettingSyncData(
- SyncChange::ACTION_INVALID, "", "", new DictionaryValue());
+ SyncChange::ACTION_INVALID, "", "",
+ scoped_ptr<Value>(new DictionaryValue()));
}
if (matching_changes.size() != 1u) {
ADD_FAILURE() << matching_changes.size() << " matching changes for " <<
@@ -286,9 +287,9 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) {
SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
- "s1", "foo", value1));
+ "s1", "foo", value1, model_type));
sync_data.push_back(settings_sync_util::CreateData(
- "s2", "bar", value2));
+ "s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
@@ -357,9 +358,9 @@ TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
- "s1", "foo", value1));
+ "s1", "foo", value1, model_type));
sync_data.push_back(settings_sync_util::CreateData(
- "s2", "bar", value2));
+ "s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
expected1.Set("foo", value1.DeepCopy());
@@ -398,7 +399,7 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
- "s2", "bar", value2));
+ "s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
@@ -407,9 +408,9 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
// Make sync add some settings.
SyncChangeList change_list;
change_list.push_back(settings_sync_util::CreateAdd(
- "s1", "bar", value2));
+ "s1", "bar", value2, model_type));
change_list.push_back(settings_sync_util::CreateAdd(
- "s2", "foo", value1));
+ "s2", "foo", value1, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
expected1.Set("bar", value2.DeepCopy());
expected2.Set("foo", value1.DeepCopy());
@@ -421,9 +422,9 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
// initial setting.
change_list.clear();
change_list.push_back(settings_sync_util::CreateUpdate(
- "s1", "bar", value2));
+ "s1", "bar", value2, model_type));
change_list.push_back(settings_sync_util::CreateUpdate(
- "s2", "bar", value1));
+ "s2", "bar", value1, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
expected1.Set("bar", value2.DeepCopy());
expected2.Set("bar", value1.DeepCopy());
@@ -435,9 +436,9 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
// new setting.
change_list.clear();
change_list.push_back(settings_sync_util::CreateDelete(
- "s1", "foo"));
+ "s1", "foo", model_type));
change_list.push_back(settings_sync_util::CreateDelete(
- "s2", "foo"));
+ "s2", "foo", model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
expected1.Remove("foo", NULL);
expected2.Remove("foo", NULL);
@@ -468,9 +469,9 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) {
SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
- "s3", "bar", value2));
+ "s3", "bar", value2, model_type));
sync_data.push_back(settings_sync_util::CreateData(
- "s4", "bar", value2));
+ "s4", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
@@ -617,7 +618,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
// Stop each separately, there should be no changes either time.
SyncDataList sync_data;
sync_data.push_back(settings_sync_util::CreateData(
- "s1", "foo", value1));
+ "s1", "foo", value1, syncable::EXTENSION_SETTINGS));
GetSyncableService(syncable::EXTENSION_SETTINGS)->
MergeDataAndStartSyncing(syncable::EXTENSION_SETTINGS, sync_data, &sync_);
@@ -627,7 +628,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
sync_data.clear();
sync_data.push_back(settings_sync_util::CreateData(
- "s2", "bar", value2));
+ "s2", "bar", value2, syncable::APP_SETTINGS));
GetSyncableService(syncable::APP_SETTINGS)->
MergeDataAndStartSyncing(syncable::APP_SETTINGS, sync_data, &sync_);
@@ -657,10 +658,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
testing_factory->GetExisting("bad")->SetFailAllRequests(true);
{
SyncDataList sync_data;
- sync_data.push_back(
- settings_sync_util::CreateData("good", "foo", fooValue));
- sync_data.push_back(
- settings_sync_util::CreateData("bad", "foo", fooValue));
+ sync_data.push_back(settings_sync_util::CreateData(
+ "good", "foo", fooValue, model_type));
+ sync_data.push_back(settings_sync_util::CreateData(
+ "bad", "foo", fooValue, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
}
@@ -702,12 +703,12 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
// not failing).
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateUpdate("good", "foo", barValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "good", "foo", barValue, model_type));
// (Sending UPDATE here even though it's adding, since that's what the state
// of sync is. In any case, it won't work.)
- change_list.push_back(
- settings_sync_util::CreateUpdate("bad", "foo", barValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "bad", "foo", barValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -750,11 +751,11 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
testing_factory->GetExisting("bad")->SetFailAllRequests(true);
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateUpdate("good", "foo", fooValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "good", "foo", fooValue, model_type));
// (Ditto.)
- change_list.push_back(
- settings_sync_util::CreateUpdate("bad", "foo", fooValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "bad", "foo", fooValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
testing_factory->GetExisting("bad")->SetFailAllRequests(false);
@@ -806,10 +807,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
// And ProcessSyncChanges work, too.
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateUpdate("good", "bar", fooValue));
- change_list.push_back(
- settings_sync_util::CreateUpdate("bad", "bar", fooValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "good", "bar", fooValue, model_type));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "bad", "bar", fooValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -845,10 +846,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
// Unlike before, initially succeeding MergeDataAndStartSyncing.
{
SyncDataList sync_data;
- sync_data.push_back(
- settings_sync_util::CreateData("good", "foo", fooValue));
- sync_data.push_back(
- settings_sync_util::CreateData("bad", "foo", fooValue));
+ sync_data.push_back(settings_sync_util::CreateData(
+ "good", "foo", fooValue, model_type));
+ sync_data.push_back(settings_sync_util::CreateData(
+ "bad", "foo", fooValue, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type, sync_data, &sync_);
}
@@ -870,10 +871,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
testing_factory->GetExisting("bad")->SetFailAllRequests(true);
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateAdd("good", "bar", barValue));
- change_list.push_back(
- settings_sync_util::CreateAdd("bad", "bar", barValue));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "good", "bar", barValue, model_type));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "bad", "bar", barValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
testing_factory->GetExisting("bad")->SetFailAllRequests(false);
@@ -903,10 +904,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
// No more changes received from sync should go to bad.
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateAdd("good", "foo", fooValue));
- change_list.push_back(
- settings_sync_util::CreateAdd("bad", "foo", fooValue));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "good", "foo", fooValue, model_type));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "bad", "foo", fooValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -1017,12 +1018,12 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateUpdate("good", "foo", barValue));
+ change_list.push_back(settings_sync_util::CreateUpdate(
+ "good", "foo", barValue, model_type));
// (Sending ADD here even though it's updating, since that's what the state
// of sync is. In any case, it won't work.)
- change_list.push_back(
- settings_sync_util::CreateAdd("bad", "foo", barValue));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "bad", "foo", barValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -1108,10 +1109,10 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
// Changes from sync will be sent to good, not to bad.
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateAdd("good", "bar", barValue));
- change_list.push_back(
- settings_sync_util::CreateAdd("bad", "bar", barValue));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "good", "bar", barValue, model_type));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "bad", "bar", barValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -1198,10 +1199,10 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
// Changes from sync will be sent to good, not to bad.
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateAdd("good", "bar", barValue));
- change_list.push_back(
- settings_sync_util::CreateAdd("bad", "bar", barValue));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "good", "bar", barValue, model_type));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "bad", "bar", barValue, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
@@ -1271,10 +1272,10 @@ TEST_F(ExtensionSettingsSyncTest,
SettingsStorage* storage2 = AddExtensionAndGetStorage("s2", type);
{
SyncChangeList change_list;
- change_list.push_back(
- settings_sync_util::CreateAdd("s1", "large_value", large_value));
- change_list.push_back(
- settings_sync_util::CreateAdd("s2", "large_value", large_value));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "s1", "large_value", large_value, model_type));
+ change_list.push_back(settings_sync_util::CreateAdd(
+ "s2", "large_value", large_value, model_type));
GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
}
{
« chrome/browser/extensions/settings/settings_apitest.cc ('K') | « chrome/browser/extensions/settings/settings_backend.cc ('k') | chrome/browser/extensions/settings/settings_sync_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698