[Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

chrome/browser/extensions/settings/settings_sync_unittest.cc

 // Copyright (c) 2012 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 124 matching lines @@
            extension_id << "/" << key << " (out of " << changes_.size() << ")";
     }
     return matching_changes[0];
   }
 
  private:
   SettingSyncDataList changes_;
   bool fail_all_requests_;
 };
 
+class SyncChangeProcessorDelegate : public SyncChangeProcessor {
+ public:
+  explicit SyncChangeProcessorDelegate(SyncChangeProcessor* recipient)
+      : recipient_(recipient) {
+    DCHECK(recipient_);
+  }
+  virtual ~SyncChangeProcessorDelegate() {}
+
+  // SyncChangeProcessor implementation.
+  virtual SyncError ProcessSyncChanges(
+      const tracked_objects::Location& from_here,
+      const SyncChangeList& change_list) OVERRIDE {
+    return recipient_->ProcessSyncChanges(from_here, change_list);
+  }
+
+ private:
+  // The recipient of all sync changes.
+  SyncChangeProcessor* recipient_;
+
+  DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
+};
+
 // SettingsStorageFactory which always returns TestingSettingsStorage objects,
 // and allows individually created objects to be returned.
 class TestingSettingsStorageFactory : public SettingsStorageFactory {
  public:
   TestingSettingsStorage* GetExisting(const std::string& extension_id) {
     DCHECK(created_.count(extension_id));
     return created_[extension_id];
   }
 
   // SettingsStorageFactory implementation.
@@ skipping 20 matching lines @@
   *dst = frontend->GetBackendForSync(type);
 }
 
 }  // namespace
 
 class ExtensionSettingsSyncTest : public testing::Test {
  public:
   ExtensionSettingsSyncTest()
       : ui_thread_(BrowserThread::UI, MessageLoop::current()),
         file_thread_(BrowserThread::FILE, MessageLoop::current()),
-        storage_factory_(new util::ScopedSettingsStorageFactory()) {}
+        storage_factory_(new util::ScopedSettingsStorageFactory()),
+        sync_processor_(new MockSyncChangeProcessor),
+        sync_processor_delegate_(new SyncChangeProcessorDelegate(
+            sync_processor_.get())) {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     profile_.reset(new util::MockProfile(temp_dir_.path()));
     storage_factory_->Reset(new SettingsLeveldbStorage::Factory());
     frontend_.reset(
         SettingsFrontend::Create(storage_factory_.get(), profile_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 30 matching lines @@
     }
     return as_map;
   }
 
   // Need these so that the DCHECKs for running on FILE or UI threads pass.
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   ScopedTempDir temp_dir_;
-  MockSyncChangeProcessor sync_;
   scoped_ptr<util::MockProfile> profile_;
   scoped_ptr<SettingsFrontend> frontend_;
   scoped_refptr<util::ScopedSettingsStorageFactory> storage_factory_;
+  scoped_ptr<MockSyncChangeProcessor> sync_processor_;
+  scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_;
 };
 
 // Get a semblance of coverage for both EXTENSION_SETTINGS and APP_SETTINGS
 // sync by roughly alternative which one to test.
 
 TEST_F(ExtensionSettingsSyncTest, NoDataDoesNotInvokeSync) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
   Extension::Type type = Extension::TYPE_EXTENSION;
 
   EXPECT_EQ(0u, GetAllSyncData(model_type).size());
 
   // Have one extension created before sync is set up, the other created after.
   AddExtensionAndGetStorage("s1", type);
   EXPECT_EQ(0u, GetAllSyncData(model_type).size());
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   AddExtensionAndGetStorage("s2", type);
   EXPECT_EQ(0u, GetAllSyncData(model_type).size());
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
   EXPECT_EQ(0u, GetAllSyncData(model_type).size());
 }
 
 TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) {
   syncable::ModelType model_type = syncable::APP_SETTINGS;
   Extension::Type type = Extension::TYPE_PACKAGED_APP;
 
   StringValue value1("fooValue");
   ListValue value2;
   value2.Append(StringValue::CreateStringValue("barValue"));
@@ skipping 12 matching lines @@
   EXPECT_EQ(1u, all_sync_data["s2"].size());
   EXPECT_PRED_FORMAT2(ValuesEq, &value2, &all_sync_data["s2"][0].value());
 
   SyncDataList sync_data;
   sync_data.push_back(settings_sync_util::CreateData(
       "s1", "foo", value1, model_type));
   sync_data.push_back(settings_sync_util::CreateData(
       "s2", "bar", value2, model_type));
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, sync_data, &sync_);
+      model_type, sync_data,
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // Already in sync, so no changes.
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   // Regression test: not-changing the synced value shouldn't result in a sync
   // change, and changing the synced value should result in an update.
   storage1->Set(DEFAULTS, "foo", value1);
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   storage1->Set(DEFAULTS, "foo", value2);
-  EXPECT_EQ(1u, sync_.changes().size());
-  SettingSyncData change = sync_.GetOnlyChange("s1", "foo");
+  EXPECT_EQ(1u, sync_processor_->changes().size());
+  SettingSyncData change = sync_processor_->GetOnlyChange("s1", "foo");
   EXPECT_EQ(SyncChange::ACTION_UPDATE, change.change_type());
   EXPECT_TRUE(value2.Equals(&change.value()));
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 TEST_F(ExtensionSettingsSyncTest, LocalDataWithNoSyncDataIsPushedToSync) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
   Extension::Type type = Extension::TYPE_EXTENSION;
 
   StringValue value1("fooValue");
   ListValue value2;
   value2.Append(StringValue::CreateStringValue("barValue"));
 
   SettingsStorage* storage1 = AddExtensionAndGetStorage("s1", type);
   SettingsStorage* storage2 = AddExtensionAndGetStorage("s2", type);
 
   storage1->Set(DEFAULTS, "foo", value1);
   storage2->Set(DEFAULTS, "bar", value2);
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // All settings should have been pushed to sync.
-  EXPECT_EQ(2u, sync_.changes().size());
-  SettingSyncData change = sync_.GetOnlyChange("s1", "foo");
+  EXPECT_EQ(2u, sync_processor_->changes().size());
+  SettingSyncData change = sync_processor_->GetOnlyChange("s1", "foo");
   EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
   EXPECT_TRUE(value1.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s2", "bar");
+  change = sync_processor_->GetOnlyChange("s2", "bar");
   EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
   EXPECT_TRUE(value2.Equals(&change.value()));
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
   syncable::ModelType model_type = syncable::APP_SETTINGS;
   Extension::Type type = Extension::TYPE_PACKAGED_APP;
 
   StringValue value1("fooValue");
   ListValue value2;
   value2.Append(StringValue::CreateStringValue("barValue"));
 
   // Maintain dictionaries mirrored to the expected values of the settings in
   // each storage area.
   DictionaryValue expected1, expected2;
 
   // Pre-populate one of the storage areas.
   SettingsStorage* storage1 = AddExtensionAndGetStorage("s1", type);
   storage1->Set(DEFAULTS, "overwriteMe", value1);
 
   SyncDataList sync_data;
   sync_data.push_back(settings_sync_util::CreateData(
       "s1", "foo", value1, model_type));
   sync_data.push_back(settings_sync_util::CreateData(
       "s2", "bar", value2, model_type));
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, sync_data, &sync_);
+      model_type, sync_data,
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   expected1.Set("foo", value1.DeepCopy());
   expected2.Set("bar", value2.DeepCopy());
 
   SettingsStorage* storage2 = AddExtensionAndGetStorage("s2", type);
 
   // All changes should be local, so no sync changes.
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   // Sync settings should have been pushed to local settings.
   EXPECT_PRED_FORMAT2(SettingsEq, expected1, storage1->Get());
   EXPECT_PRED_FORMAT2(SettingsEq, expected2, storage2->Get());
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
@@ skipping 12 matching lines @@
   SettingsStorage* storage2 = AddExtensionAndGetStorage("s2", type);
 
   storage1->Set(DEFAULTS, "foo", value1);
   expected1.Set("foo", value1.DeepCopy());
 
   SyncDataList sync_data;
   sync_data.push_back(settings_sync_util::CreateData(
       "s2", "bar", value2, model_type));
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, sync_data, &sync_);
+      model_type, sync_data,
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   expected2.Set("bar", value2.DeepCopy());
 
   // Make sync add some settings.
   SyncChangeList change_list;
   change_list.push_back(settings_sync_util::CreateAdd(
       "s1", "bar", value2, model_type));
   change_list.push_back(settings_sync_util::CreateAdd(
       "s2", "foo", value1, model_type));
   GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
   expected1.Set("bar", value2.DeepCopy());
@@ skipping 51 matching lines @@
   storage1->Set(DEFAULTS, "foo", value1);
   storage2->Set(DEFAULTS, "foo", value1);
 
   SyncDataList sync_data;
   sync_data.push_back(settings_sync_util::CreateData(
       "s3", "bar", value2, model_type));
   sync_data.push_back(settings_sync_util::CreateData(
       "s4", "bar", value2, model_type));
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, sync_data, &sync_);
+      model_type, sync_data,
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // Add something locally.
   storage1->Set(DEFAULTS, "bar", value2);
   storage2->Set(DEFAULTS, "bar", value2);
   storage3->Set(DEFAULTS, "foo", value1);
   storage4->Set(DEFAULTS, "foo", value1);
 
-  SettingSyncData change = sync_.GetOnlyChange("s1", "bar");
+  SettingSyncData change = sync_processor_->GetOnlyChange("s1", "bar");
     EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
     EXPECT_TRUE(value2.Equals(&change.value()));
-  sync_.GetOnlyChange("s2", "bar");
+  sync_processor_->GetOnlyChange("s2", "bar");
     EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
     EXPECT_TRUE(value2.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s3", "foo");
+  change = sync_processor_->GetOnlyChange("s3", "foo");
     EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
     EXPECT_TRUE(value1.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s4", "foo");
+  change = sync_processor_->GetOnlyChange("s4", "foo");
     EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
     EXPECT_TRUE(value1.Equals(&change.value()));
 
   // Change something locally, storage1/3 the new setting and storage2/4 the
   // initial setting, for all combinations of local vs sync intialisation and
   // new vs initial.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   storage1->Set(DEFAULTS, "bar", value1);
   storage2->Set(DEFAULTS, "foo", value2);
   storage3->Set(DEFAULTS, "bar", value1);
   storage4->Set(DEFAULTS, "foo", value2);
 
-  change = sync_.GetOnlyChange("s1", "bar");
+  change = sync_processor_->GetOnlyChange("s1", "bar");
     EXPECT_EQ(SyncChange::ACTION_UPDATE, change.change_type());
     EXPECT_TRUE(value1.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s2", "foo");
+  change = sync_processor_->GetOnlyChange("s2", "foo");
     EXPECT_EQ(SyncChange::ACTION_UPDATE, change.change_type());
     EXPECT_TRUE(value2.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s3", "bar");
+  change = sync_processor_->GetOnlyChange("s3", "bar");
     EXPECT_EQ(SyncChange::ACTION_UPDATE, change.change_type());
     EXPECT_TRUE(value1.Equals(&change.value()));
-  change = sync_.GetOnlyChange("s4", "foo");
+  change = sync_processor_->GetOnlyChange("s4", "foo");
     EXPECT_EQ(SyncChange::ACTION_UPDATE, change.change_type());
     EXPECT_TRUE(value2.Equals(&change.value()));
 
   // Remove something locally, storage1/3 the new setting and storage2/4 the
   // initial setting, for all combinations of local vs sync intialisation and
   // new vs initial.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   storage1->Remove("foo");
   storage2->Remove("bar");
   storage3->Remove("foo");
   storage4->Remove("bar");
 
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s1", "foo").change_type());
+      sync_processor_->GetOnlyChange("s1", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s2", "bar").change_type());
+      sync_processor_->GetOnlyChange("s2", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s3", "foo").change_type());
+      sync_processor_->GetOnlyChange("s3", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s4", "bar").change_type());
+      sync_processor_->GetOnlyChange("s4", "bar").change_type());
 
   // Remove some nonexistent settings.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   storage1->Remove("foo");
   storage2->Remove("bar");
   storage3->Remove("foo");
   storage4->Remove("bar");
 
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   // Clear the rest of the settings.  Add the removed ones back first so that
   // more than one setting is cleared.
   storage1->Set(DEFAULTS, "foo", value1);
   storage2->Set(DEFAULTS, "bar", value2);
   storage3->Set(DEFAULTS, "foo", value1);
   storage4->Set(DEFAULTS, "bar", value2);
 
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   storage1->Clear();
   storage2->Clear();
   storage3->Clear();
   storage4->Clear();
 
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s1", "foo").change_type());
+      sync_processor_->GetOnlyChange("s1", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s1", "bar").change_type());
+      sync_processor_->GetOnlyChange("s1", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s2", "foo").change_type());
+      sync_processor_->GetOnlyChange("s2", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s2", "bar").change_type());
+      sync_processor_->GetOnlyChange("s2", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s3", "foo").change_type());
+      sync_processor_->GetOnlyChange("s3", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s3", "bar").change_type());
+      sync_processor_->GetOnlyChange("s3", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s4", "foo").change_type());
+      sync_processor_->GetOnlyChange("s4", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_DELETE,
-      sync_.GetOnlyChange("s4", "bar").change_type());
+      sync_processor_->GetOnlyChange("s4", "bar").change_type());
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
   StringValue value1("fooValue");
   ListValue value2;
   value2.Append(StringValue::CreateStringValue("barValue"));
 
   // storage1 is an extension, storage2 is an app.
@@ skipping 15 matching lines @@
       GetAllSyncData(syncable::APP_SETTINGS);
   EXPECT_EQ(1u, app_sync_data.size());
   EXPECT_EQ(1u, app_sync_data["s2"].size());
   EXPECT_PRED_FORMAT2(ValuesEq, &value2, &app_sync_data["s2"][0].value());
 
   // Stop each separately, there should be no changes either time.
   SyncDataList sync_data;
   sync_data.push_back(settings_sync_util::CreateData(
       "s1", "foo", value1, syncable::EXTENSION_SETTINGS));
 
-  GetSyncableService(syncable::EXTENSION_SETTINGS)->
-      MergeDataAndStartSyncing(syncable::EXTENSION_SETTINGS, sync_data, &sync_);
+  GetSyncableService(syncable::EXTENSION_SETTINGS)->MergeDataAndStartSyncing(
+      syncable::EXTENSION_SETTINGS,
+      sync_data,
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   GetSyncableService(syncable::EXTENSION_SETTINGS)->
       StopSyncing(syncable::EXTENSION_SETTINGS);
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   sync_data.clear();
   sync_data.push_back(settings_sync_util::CreateData(
       "s2", "bar", value2, syncable::APP_SETTINGS));
 
-  GetSyncableService(syncable::APP_SETTINGS)->
-      MergeDataAndStartSyncing(syncable::APP_SETTINGS, sync_data, &sync_);
+  scoped_ptr<SyncChangeProcessorDelegate> app_settings_delegate_(
+      new SyncChangeProcessorDelegate(sync_processor_.get()));
+  GetSyncableService(syncable::APP_SETTINGS)->MergeDataAndStartSyncing(
+      syncable::APP_SETTINGS,
+      sync_data,
+      app_settings_delegate_.PassAs<SyncChangeProcessor>());
   GetSyncableService(syncable::APP_SETTINGS)->
       StopSyncing(syncable::APP_SETTINGS);
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 }
 
 TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
   Extension::Type type = Extension::TYPE_EXTENSION;
 
   StringValue fooValue("fooValue");
   StringValue barValue("barValue");
 
   // There is a bit of a convoluted method to get storage areas that can fail;
   // hand out TestingSettingsStorage object then toggle them failing/succeeding
   // as necessary.
   TestingSettingsStorageFactory* testing_factory =
       new TestingSettingsStorageFactory();
   storage_factory_->Reset(testing_factory);
 
   SettingsStorage* good = AddExtensionAndGetStorage("good", type);
   SettingsStorage* bad = AddExtensionAndGetStorage("bad", type);
 
   // Make bad fail for incoming sync changes.
   testing_factory->GetExisting("bad")->SetFailAllRequests(true);
   {
     SyncDataList sync_data;
     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_);
+        model_type,
+        sync_data,
+        sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   }
   testing_factory->GetExisting("bad")->SetFailAllRequests(false);
 
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Changes made to good should be sent to sync, changes from bad shouldn't.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", barValue);
   bad->Set(DEFAULTS, "bar", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("bar", barValue.DeepCopy());
@@ skipping 20 matching lines @@
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Changes made to bad still shouldn't go to sync, even though it didn't fail
   // last time.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", fooValue);
   bad->Set(DEFAULTS, "bar", fooValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "bar").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     dict.Set("bar", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("bar", fooValue.DeepCopy());
@@ skipping 19 matching lines @@
     dict.Set("bar", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("bar", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Restarting sync should make bad start syncing again.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   GetSyncableService(model_type)->StopSyncing(model_type);
+  sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
+      sync_processor_.get()));
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // Local settings will have been pushed to sync, since it's empty (in this
   // test; presumably it wouldn't be live, since we've been getting changes).
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "bar").change_type());
-  EXPECT_EQ(3u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "bar").change_type());
+  EXPECT_EQ(3u, sync_processor_->changes().size());
 
   // Live local changes now get pushed, too.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", barValue);
   bad->Set(DEFAULTS, "bar", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("bad", "bar").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "bar").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 
   // And ProcessSyncChanges work, too.
   {
     SyncChangeList change_list;
     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);
   }
@@ skipping 28 matching lines @@
   SettingsStorage* bad = AddExtensionAndGetStorage("bad", type);
 
   // Unlike before, initially succeeding MergeDataAndStartSyncing.
   {
     SyncDataList sync_data;
     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_);
+        model_type,
+        sync_data,
+        sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   }
 
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
@@ skipping 17 matching lines @@
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // No more changes sent to sync for bad.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "foo", barValue);
   bad->Set(DEFAULTS, "foo", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   // No more changes received from sync should go to bad.
   {
     SyncChangeList change_list;
     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);
   }
@@ skipping 34 matching lines @@
   {
     SyncDataList all_sync_data =
         GetSyncableService(model_type)->GetAllSyncData(model_type);
     EXPECT_EQ(1u, all_sync_data.size());
     EXPECT_EQ("good/foo", all_sync_data[0].GetTag());
   }
   testing_factory->GetExisting("bad")->SetFailAllRequests(false);
 
   // Sync shouldn't be disabled for good (nor bad -- but this is unimportant).
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "foo").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "foo").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", barValue);
   bad->Set(DEFAULTS, "bar", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "bar").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "bar").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 }
 
 TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
   syncable::ModelType model_type = syncable::APP_SETTINGS;
   Extension::Type type = Extension::TYPE_PACKAGED_APP;
 
   StringValue fooValue("fooValue");
   StringValue barValue("barValue");
 
   TestingSettingsStorageFactory* testing_factory =
       new TestingSettingsStorageFactory();
   storage_factory_->Reset(testing_factory);
 
   SettingsStorage* good = AddExtensionAndGetStorage("good", type);
   SettingsStorage* bad = AddExtensionAndGetStorage("bad", type);
 
   good->Set(DEFAULTS, "foo", fooValue);
   bad->Set(DEFAULTS, "foo", fooValue);
 
   // good will successfully push foo:fooValue to sync, but bad will fail to
   // get them so won't.
   testing_factory->GetExisting("bad")->SetFailAllRequests(true);
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
   testing_factory->GetExisting("bad")->SetFailAllRequests(false);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   // bad should now be disabled for sync.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", barValue);
   bad->Set(DEFAULTS, "bar", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   {
     SyncChangeList change_list;
     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, model_type));
     GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
   }
 
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("foo", fooValue.DeepCopy());
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Re-enabling sync without failing should cause the local changes from bad
   // to be pushed to sync successfully, as should future changes to bad.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   GetSyncableService(model_type)->StopSyncing(model_type);
+  sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
+      sync_processor_.get()));
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "foo").change_type());
+      sync_processor_->GetOnlyChange("bad", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "bar").change_type());
-  EXPECT_EQ(4u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "bar").change_type());
+  EXPECT_EQ(4u, sync_processor_->changes().size());
 
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "bar", fooValue);
   bad->Set(DEFAULTS, "bar", fooValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "bar").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 }
 
 TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
   Extension::Type type = Extension::TYPE_EXTENSION;
 
   StringValue fooValue("fooValue");
   StringValue barValue("barValue");
 
   TestingSettingsStorageFactory* testing_factory =
       new TestingSettingsStorageFactory();
   storage_factory_->Reset(testing_factory);
 
   SettingsStorage* good = AddExtensionAndGetStorage("good", type);
   SettingsStorage* bad = AddExtensionAndGetStorage("bad", type);
 
   // Only set bad; setting good will cause it to fail below.
   bad->Set(DEFAULTS, "foo", fooValue);
 
-  sync_.SetFailAllRequests(true);
+  sync_processor_->SetFailAllRequests(true);
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
-  sync_.SetFailAllRequests(false);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
+  sync_processor_->SetFailAllRequests(false);
 
   // Changes from good will be send to sync, changes from bad won't.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "foo", barValue);
   bad->Set(DEFAULTS, "foo", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   // 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, model_type));
     change_list.push_back(settings_sync_util::CreateAdd(
           "bad", "bar", barValue, model_type));
     GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
   }
 
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Restarting sync makes everything work again.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   GetSyncableService(model_type)->StopSyncing(model_type);
+  sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
+      sync_processor_.get()));
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "foo").change_type());
-  EXPECT_EQ(3u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "foo").change_type());
+  EXPECT_EQ(3u, sync_processor_->changes().size());
 
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "foo", fooValue);
   bad->Set(DEFAULTS, "foo", fooValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 }
 
 TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
   syncable::ModelType model_type = syncable::EXTENSION_SETTINGS;
   Extension::Type type = Extension::TYPE_EXTENSION;
 
   StringValue fooValue("fooValue");
   StringValue barValue("barValue");
 
   TestingSettingsStorageFactory* testing_factory =
       new TestingSettingsStorageFactory();
   storage_factory_->Reset(testing_factory);
 
   SettingsStorage* good = AddExtensionAndGetStorage("good", type);
   SettingsStorage* bad = AddExtensionAndGetStorage("bad", type);
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // bad will fail to send changes.
   good->Set(DEFAULTS, "foo", fooValue);
-  sync_.SetFailAllRequests(true);
+  sync_processor_->SetFailAllRequests(true);
   bad->Set(DEFAULTS, "foo", fooValue);
-  sync_.SetFailAllRequests(false);
+  sync_processor_->SetFailAllRequests(false);
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   // No further changes should be sent from bad.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "foo", barValue);
   bad->Set(DEFAULTS, "foo", barValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(1u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(1u, sync_processor_->changes().size());
 
   // 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, model_type));
     change_list.push_back(settings_sync_util::CreateAdd(
           "bad", "bar", barValue, model_type));
     GetSyncableService(model_type)->ProcessSyncChanges(FROM_HERE, change_list);
   }
 
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     dict.Set("bar", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, good->Get());
   }
   {
     DictionaryValue dict;
     dict.Set("foo", barValue.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, dict, bad->Get());
   }
 
   // Restarting sync makes everything work again.
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   GetSyncableService(model_type)->StopSyncing(model_type);
+  sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
+      sync_processor_.get()));
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("good", "bar").change_type());
+      sync_processor_->GetOnlyChange("good", "bar").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_ADD,
-      sync_.GetOnlyChange("bad", "foo").change_type());
-  EXPECT_EQ(3u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("bad", "foo").change_type());
+  EXPECT_EQ(3u, sync_processor_->changes().size());
 
-  sync_.ClearChanges();
+  sync_processor_->ClearChanges();
   good->Set(DEFAULTS, "foo", fooValue);
   bad->Set(DEFAULTS, "foo", fooValue);
 
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
   EXPECT_EQ(
       SyncChange::ACTION_UPDATE,
-      sync_.GetOnlyChange("good", "foo").change_type());
-  EXPECT_EQ(2u, sync_.changes().size());
+      sync_processor_->GetOnlyChange("good", "foo").change_type());
+  EXPECT_EQ(2u, sync_processor_->changes().size());
 }
 
 TEST_F(ExtensionSettingsSyncTest,
-    LargeOutgoingChangeRejectedButIncomingAccepted) {
+       LargeOutgoingChangeRejectedButIncomingAccepted) {
   syncable::ModelType model_type = syncable::APP_SETTINGS;
   Extension::Type type = Extension::TYPE_PACKAGED_APP;
 
   // This value should be larger than the limit in settings_backend.cc.
   std::string string_5k;
   for (size_t i = 0; i < 5000; ++i) {
     string_5k.append("a");
   }
   StringValue large_value(string_5k);
 
   GetSyncableService(model_type)->MergeDataAndStartSyncing(
-      model_type, SyncDataList(), &sync_);
+      model_type,
+      SyncDataList(),
+      sync_processor_delegate_.PassAs<SyncChangeProcessor>());
 
   // Large local change rejected and doesn't get sent out.
   SettingsStorage* storage1 = AddExtensionAndGetStorage("s1", type);
   EXPECT_TRUE(storage1->Set(DEFAULTS, "large_value", large_value).HasError());
-  EXPECT_EQ(0u, sync_.changes().size());
+  EXPECT_EQ(0u, sync_processor_->changes().size());
 
   // Large incoming change should still get accepted.
   SettingsStorage* storage2 = AddExtensionAndGetStorage("s2", type);
   {
     SyncChangeList change_list;
     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);
   }
   {
     DictionaryValue expected;
     expected.Set("large_value", large_value.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());
     EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());
   }
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 }  // namespace extensions