Remove duplicated code from sync related unit tests.

chrome/browser/notifications/sync_notifier/chrome_notifier_service_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 <map>
 
 #include "base/command_line.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
 #include "chrome/browser/notifications/sync_notifier/sync_notifier_test_utils.h"
 #include "chrome/browser/notifications/sync_notifier/synced_notification.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_change_processor.h"
+#include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center_util.h"
 
 using sync_pb::SyncedNotificationSpecifics;
 using sync_pb::EntitySpecifics;
 using syncer::SyncData;
 using syncer::SyncChange;
 using syncer::SyncChangeList;
+using syncer::SyncChangeProcessorWrapperForTest;
 using syncer::SyncDataList;
 using syncer::SYNCED_NOTIFICATIONS;
 using notifier::SyncedNotification;
 using notifier::ChromeNotifierService;
 
 namespace {
 
 // Extract notification id from syncer::SyncData.
 std::string GetNotificationId(const SyncData& sync_data) {
   SyncedNotificationSpecifics specifics = sync_data.GetSpecifics().
@@ skipping 43 matching lines @@
     return change_map_[id];
   }
 
  private:
   // Track the changes received in ProcessSyncChanges.
   std::map<std::string, SyncChange> change_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeProcessor);
 };
 
-class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor {
- public:
-  explicit SyncChangeProcessorDelegate(SyncChangeProcessor* recipient)
-      : recipient_(recipient) {
-    EXPECT_TRUE(recipient_);
-  }
-  virtual ~SyncChangeProcessorDelegate() {}
-
-  // syncer::SyncChangeProcessor implementation.
-  virtual syncer::SyncError ProcessSyncChanges(
-      const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) OVERRIDE {
-    return recipient_->ProcessSyncChanges(from_here, change_list);
-  }
-
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      OVERRIDE {
-    return recipient_->GetAllSyncData(type);
-  }
-
- private:
-  // The recipient of all sync changes.
-  SyncChangeProcessor* recipient_;
-
-  DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
-};
-
 class ChromeNotifierServiceTest : public testing::Test {
  public:
   ChromeNotifierServiceTest()
       : sync_processor_(new TestChangeProcessor),
-        sync_processor_delegate_(new SyncChangeProcessorDelegate(
-            sync_processor_.get())) {}
+        sync_processor_wrapper_(
+            new SyncChangeProcessorWrapperForTest(sync_processor_.get())) {}
   virtual ~ChromeNotifierServiceTest() {}
 
   // Methods from testing::Test.
   virtual void SetUp() {
     // These tests rely on synced notifications being active.  Some testers
     // report the channel as STABLE so we need to manually enable it.
     // See crbug.com/338426 for details.
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableSyncSyncedNotifications);
 
@@ skipping 12 matching lines @@
 
   StubNotificationUIManager* notification_manager() {
     return notification_manager_.get();
   }
 
   TestChangeProcessor* processor() {
     return static_cast<TestChangeProcessor*>(sync_processor_.get());
   }
 
   scoped_ptr<syncer::SyncChangeProcessor> PassProcessor() {
-    return sync_processor_delegate_.Pass();
+    return sync_processor_wrapper_.Pass();
   }
 
   SyncedNotification* CreateNotification(
       const std::string& title,
       const std::string& text,
       const std::string& app_icon_url,
       const std::string& image_url,
       const std::string& app_id,
       const std::string& key,
       sync_pb::CoalescedSyncedNotification_ReadState read_state) {
@@ skipping 15 matching lines @@
         FROM_HERE,
         type,
         ChromeNotifierService::CreateSyncDataFromNotification(*notification));
   }
 
  protected:
   scoped_ptr<TestingProfile> profile_;
 
  private:
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
-  scoped_ptr<syncer::SyncChangeProcessor> sync_processor_delegate_;
+  scoped_ptr<syncer::SyncChangeProcessor> sync_processor_wrapper_;
   scoped_ptr<StubNotificationUIManager> notification_manager_;
   content::TestBrowserThreadBundle thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNotifierServiceTest);
 };
 
 // TODO(petewil): Add more tests as I add functionalty.  Tests are based on
 // chrome/browser/extensions/app_notification_manager_sync_unittest.cc
 
 // Create a Notification, convert it to SyncData and convert it back.
@@ skipping 477 matching lines @@
 TEST_F(ChromeNotifierServiceTest, CheckFindAppInfo) {
   ChromeNotifierService notifier(profile_.get(), notification_manager());
   notifier.set_avoid_bitmap_fetching_for_test(true);
 
   SyncedNotificationAppInfo* app_info =
       notifier.FindAppInfo(kFirstSyncedNotificationServiceId);
   EXPECT_TRUE(app_info != NULL);
 }
 
 }  // namespace notifier