Remove duplicated code from sync related unit tests.

chrome/browser/sync/glue/favicon_cache_unittest.cc

 // Copyright (c) 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 "chrome/browser/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/api/time.h"
 #include "sync/protocol/favicon_image_specifics.pb.h"
 #include "sync/protocol/favicon_tracking_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 
 namespace {
@@ skipping 71 matching lines @@
                       change_list.begin(),
                       change_list.end());
   change_map_.erase(change_map_.begin(), change_map_.end());
   for (syncer::SyncChangeList::const_iterator iter = change_list.begin();
       iter != change_list.end(); ++iter) {
     change_map_[iter->sync_data().GetTitle()] = *iter;
   }
   return syncer::SyncError();
 }
 
-
-// SyncChangeProcessorDelegate ------------------------------------------------
-
-class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor {
- public:
-  explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient);
-  virtual ~SyncChangeProcessorDelegate();
-
-  // syncer::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 {
-    return recipient_->GetAllSyncData(type);
-  }
-
- private:
-  // The recipient of all sync changes.
-  syncer::SyncChangeProcessor* recipient_;
-
-  DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
-};
-
-SyncChangeProcessorDelegate::SyncChangeProcessorDelegate(
-    syncer::SyncChangeProcessor* recipient)
-    : recipient_(recipient) {
-  DCHECK(recipient_);
-}
-
-SyncChangeProcessorDelegate::~SyncChangeProcessorDelegate() {
-}
-
-syncer::SyncError SyncChangeProcessorDelegate::ProcessSyncChanges(
-    const tracked_objects::Location& from_here,
-    const syncer::SyncChangeList& change_list) {
-  return recipient_->ProcessSyncChanges(from_here, change_list);
-}
-
 // TestFaviconData ------------------------------------------------------------
 struct TestFaviconData {
   TestFaviconData() : last_visit_time(0), is_bookmarked(false) {}
   GURL page_url;
   GURL icon_url;
   std::string image_16;
   std::string image_32;
   std::string image_64;
   int64 last_visit_time;
   bool is_bookmarked;
@@ skipping 154 matching lines @@
                                   const GURL& icon_url,
                                   const std::string& icon_bytes,
                                   int64 last_visit_time_ms);
 
  private:
   base::MessageLoopForUI message_loop_;
   FaviconCache cache_;
 
   // Our dummy ChangeProcessor used to inspect changes pushed to Sync.
   scoped_ptr<TestChangeProcessor> sync_processor_;
-  scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_;
+  scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> sync_processor_wrapper_;
 };
 
 SyncFaviconCacheTest::SyncFaviconCacheTest()
     : cache_(NULL, kMaxSyncFavicons),
       sync_processor_(new TestChangeProcessor),
-      sync_processor_delegate_(new SyncChangeProcessorDelegate(
-                                   sync_processor_.get())) {
-}
+      sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest(
+          sync_processor_.get())) {}
 
 void SyncFaviconCacheTest::SetUpInitialSync(
     const syncer::SyncDataList& initial_image_data,
     const syncer::SyncDataList& initial_tracking_data) {
   cache()->MergeDataAndStartSyncing(syncer::FAVICON_IMAGES,
                                     initial_image_data,
                                     CreateAndPassProcessor(),
                                     CreateAndPassSyncErrorFactory());
   ASSERT_EQ(0U, processor()->GetAndResetChangeList().size());
   cache()->MergeDataAndStartSyncing(syncer::FAVICON_TRACKING,
@@ skipping 74 matching lines @@
     }
     if (!found_match)
       return testing::AssertionFailure() << "Could not find favicon.";
   }
   return testing::AssertionSuccess();
 }
 
 scoped_ptr<syncer::SyncChangeProcessor>
 SyncFaviconCacheTest::CreateAndPassProcessor() {
   return scoped_ptr<syncer::SyncChangeProcessor>(
-      new SyncChangeProcessorDelegate(sync_processor_.get()));
+      new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
 }
 
 scoped_ptr<syncer::SyncErrorFactory> SyncFaviconCacheTest::
     CreateAndPassSyncErrorFactory() {
   return scoped_ptr<syncer::SyncErrorFactory>(
       new syncer::SyncErrorFactoryMock());
 }
 
 void SyncFaviconCacheTest::OnCustomFaviconDataAvailable(
     const TestFaviconData& test_data) {
@@ skipping 1334 matching lines @@
     ASSERT_EQ(changes[2].change_type(), syncer::SyncChange::ACTION_ADD);
     ASSERT_EQ(changes[2].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
     ASSERT_EQ(changes[3].change_type(), syncer::SyncChange::ACTION_DELETE);
     ASSERT_EQ(changes[3].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   }
   EXPECT_EQ(0U, GetTaskCount());
   EXPECT_EQ((unsigned long)kMaxSyncFavicons, GetFaviconCount());
 }
 
 }  // namespace browser_sync