Remove duplicated code from sync related unit tests.

chrome/browser/managed_mode/managed_user_settings_service_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/managed_mode/managed_user_settings_service.h"
+#include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change.h"
+#include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class MockChangeProcessor : public syncer::SyncChangeProcessor {
- public:
-  MockChangeProcessor() {}
-  virtual ~MockChangeProcessor() {}
-
-  // SyncChangeProcessor implementation:
-  virtual syncer::SyncError ProcessSyncChanges(
-      const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      OVERRIDE;
-
-  const syncer::SyncChangeList& changes() const { return change_list_; }
-
- private:
-  syncer::SyncChangeList change_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockChangeProcessor);
-};
-
-syncer::SyncError MockChangeProcessor::ProcessSyncChanges(
-    const tracked_objects::Location& from_here,
-    const syncer::SyncChangeList& change_list) {
-  change_list_ = change_list;
-  return syncer::SyncError();
-}
-
-syncer::SyncDataList MockChangeProcessor::GetAllSyncData(
-    syncer::ModelType type) const {
-  return syncer::SyncDataList();
-}
-
 class MockSyncErrorFactory : public syncer::SyncErrorFactory {
  public:
   explicit MockSyncErrorFactory(syncer::ModelType type);
   virtual ~MockSyncErrorFactory();
 
   // SyncErrorFactory implementation:
   virtual syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& location,
       const std::string& message) OVERRIDE;
 
@@ skipping 23 matching lines @@
 const char kSettingsName[] = "TestingSetting";
 const char kSettingsValue[] = "SettingsValue";
 const char kSplitItemName[] = "X-SuperMoosePowers";
 
 class ManagedUserSettingsServiceTest : public ::testing::Test {
  protected:
   ManagedUserSettingsServiceTest() {}
   virtual ~ManagedUserSettingsServiceTest() {}
 
   scoped_ptr<syncer::SyncChangeProcessor> CreateSyncProcessor() {
-    sync_processor_ = new MockChangeProcessor();
-    return scoped_ptr<syncer::SyncChangeProcessor>(sync_processor_);
+    sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
+    return scoped_ptr<syncer::SyncChangeProcessor>(
+        new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
   }
 
   void StartSyncing(const syncer::SyncDataList& initial_sync_data) {
     scoped_ptr<syncer::SyncErrorFactory> error_handler(
         new MockSyncErrorFactory(syncer::MANAGED_USER_SETTINGS));
     syncer::SyncMergeResult result = settings_service_.MergeDataAndStartSyncing(
         syncer::MANAGED_USER_SETTINGS,
         initial_sync_data,
         CreateSyncProcessor(),
         error_handler.Pass());
@@ skipping 57 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     settings_service_.Shutdown();
   }
 
   base::DictionaryValue split_items_;
   scoped_ptr<base::Value> atomic_setting_value_;
   ManagedUserSettingsService settings_service_;
   scoped_ptr<base::DictionaryValue> settings_;
 
-  // Owned by the ManagedUserSettingsService.
-  MockChangeProcessor* sync_processor_;
+  scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
 };
 
 TEST_F(ManagedUserSettingsServiceTest, ProcessAtomicSetting) {
   StartSyncing(syncer::SyncDataList());
   ASSERT_TRUE(settings_);
   const base::Value* value = NULL;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
   settings_.reset();
   syncer::SyncData data =
@@ skipping 59 matching lines @@
   EXPECT_EQ(kSettingsValue, string_value);
 }
 
 TEST_F(ManagedUserSettingsServiceTest, UploadItem) {
   UploadSplitItem("foo", "bar");
   UploadSplitItem("blurp", "baz");
   UploadAtomicItem("hurdle");
 
   // Uploading should produce changes when we start syncing.
   StartSyncing(syncer::SyncDataList());
-  const syncer::SyncChangeList& changes = sync_processor_->changes();
-  ASSERT_EQ(3u, changes.size());
-  for (syncer::SyncChangeList::const_iterator it = changes.begin();
-       it != changes.end(); ++it) {
+  ASSERT_EQ(3u, sync_processor_->changes().size());
+  for (syncer::SyncChangeList::const_iterator it =
+           sync_processor_->changes().begin();
+       it != sync_processor_->changes().end();
+       ++it) {
     ASSERT_TRUE(it->IsValid());
     EXPECT_EQ(syncer::SyncChange::ACTION_ADD, it->change_type());
     VerifySyncDataItem(it->sync_data());
   }
 
   // It should also show up in local Sync data.
   syncer::SyncDataList sync_data =
       settings_service_.GetAllSyncData(syncer::MANAGED_USER_SETTINGS);
   EXPECT_EQ(3u, sync_data.size());
   for (syncer::SyncDataList::const_iterator it = sync_data.begin();
        it != sync_data.end(); ++it) {
     VerifySyncDataItem(*it);
   }
 
   // Uploading after we have started syncing should work too.
+  sync_processor_->changes().clear();
   UploadSplitItem("froodle", "narf");
   ASSERT_EQ(1u, sync_processor_->changes().size());
   syncer::SyncChange change = sync_processor_->changes()[0];
   ASSERT_TRUE(change.IsValid());
   EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type());
   VerifySyncDataItem(change.sync_data());
 
   sync_data = settings_service_.GetAllSyncData(syncer::MANAGED_USER_SETTINGS);
   EXPECT_EQ(4u, sync_data.size());
   for (syncer::SyncDataList::const_iterator it = sync_data.begin();
        it != sync_data.end(); ++it) {
     VerifySyncDataItem(*it);
   }
 
   // Uploading an item with a previously seen key should create an UPDATE
   // action.
+  sync_processor_->changes().clear();
   UploadSplitItem("blurp", "snarl");
   ASSERT_EQ(1u, sync_processor_->changes().size());
   change = sync_processor_->changes()[0];
   ASSERT_TRUE(change.IsValid());
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type());
   VerifySyncDataItem(change.sync_data());
 
   sync_data = settings_service_.GetAllSyncData(syncer::MANAGED_USER_SETTINGS);
   EXPECT_EQ(4u, sync_data.size());
   for (syncer::SyncDataList::const_iterator it = sync_data.begin();
        it != sync_data.end(); ++it) {
     VerifySyncDataItem(*it);
   }
 
+  sync_processor_->changes().clear();
   UploadAtomicItem("fjord");
   ASSERT_EQ(1u, sync_processor_->changes().size());
   change = sync_processor_->changes()[0];
   ASSERT_TRUE(change.IsValid());
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type());
   VerifySyncDataItem(change.sync_data());
 
   sync_data = settings_service_.GetAllSyncData(syncer::MANAGED_USER_SETTINGS);
   EXPECT_EQ(4u, sync_data.size());
   for (syncer::SyncDataList::const_iterator it = sync_data.begin();
        it != sync_data.end(); ++it) {
     VerifySyncDataItem(*it);
   }
 
   // The uploaded items should not show up as settings.
   const base::Value* value = NULL;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));
 
   // Restarting sync should not create any new changes.
   settings_service_.StopSyncing(syncer::MANAGED_USER_SETTINGS);
   StartSyncing(sync_data);
   ASSERT_EQ(0u, sync_processor_->changes().size());
 }