Replace changes_channel with an observer list.

chrome/browser/sync/engine/syncer_unittest.cc

 // Copyright (c) 2009 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 85 matching lines @@
 using sessions::SyncSession;
 
 namespace {
 const char* kTestData = "Hello World!";
 const int kTestDataLen = 12;
 const int64 kTestLogRequestTimestamp = 123456;
 }  // namespace
 
 class SyncerTest : public testing::Test,
                    public SyncSession::Delegate,
-                   public ModelSafeWorkerRegistrar {
+                   public ModelSafeWorkerRegistrar,
+                   public ChannelEventHandler<SyncerEvent> {
  protected:
   SyncerTest() : syncer_(NULL) {}
 
   // SyncSession::Delegate implementation.
   virtual void OnSilencedUntil(const base::TimeTicks& silenced_until) {
     FAIL() << "Should not get silenced.";
   }
   virtual bool IsSyncingCurrentlySilenced() {
     return false;
   }
@@ skipping 14 matching lines @@
   virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) {
     // We're just testing the sync engine here, so we shunt everything to
     // the SyncerThread.  Datatypes which aren't enabled aren't in the map.
     for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
       if (enabled_datatypes_[i]) {
         (*out)[syncable::ModelTypeFromInt(i)] = GROUP_PASSIVE;
       }
     }
   }
 
-  void HandleSyncerEvent(SyncerEvent event) {
+  void HandleChannelEvent(const SyncerEvent& event) {
     LOG(INFO) << "HandleSyncerEvent in unittest " << event.what_happened;
     // we only test for entry-specific events, not status changed ones.
     switch (event.what_happened) {
       case SyncerEvent::STATUS_CHANGED:
         // fall through
       case SyncerEvent::SYNC_CYCLE_ENDED:
         // fall through
       case SyncerEvent::COMMITS_SUCCEEDED:
         return;
       case SyncerEvent::SHUTDOWN_USE_WITH_CARE:
@@ skipping 26 matching lines @@
     context_.reset(new SyncSessionContext(mock_server_.get(), NULL,
         syncdb_.manager(), this));
     context_->set_account_name(syncdb_.name());
     ASSERT_FALSE(context_->syncer_event_channel());
     ASSERT_FALSE(context_->resolver());
     syncer_ = new Syncer(context_.get());
     // The Syncer installs some components on the context.
     ASSERT_TRUE(context_->syncer_event_channel());
     ASSERT_TRUE(context_->resolver());
 
-    hookup_.reset(NewEventListenerHookup(context_->syncer_event_channel(), this,
-                                         &SyncerTest::HandleSyncerEvent));
+    hookup_.reset(context_->syncer_event_channel()->AddObserver(this));
     session_.reset(new SyncSession(context_.get(), this));
 
     ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
     CHECK(dir.good());
     ReadTransaction trans(dir, __FILE__, __LINE__);
     syncable::Directory::ChildHandles children;
     dir->GetChildHandles(&trans, trans.root_id(), &children);
     ASSERT_TRUE(0 == children.size());
     syncer_events_.clear();
     root_id_ = TestIdFactory::root();
@@ skipping 214 matching lines @@
   // TODO(chron): Get rid of these inbuilt IDs. They only make it
   // more confusing.
   syncable::Id root_id_;
   syncable::Id parent_id_;
   syncable::Id child_id_;
 
   TestIdFactory ids_;
 
   TestDirectorySetterUpper syncdb_;
   scoped_ptr<MockConnectionManager> mock_server_;
-  scoped_ptr<EventListenerHookup> hookup_;
+  scoped_ptr<ChannelHookup<SyncerEvent> > hookup_;
 
   Syncer* syncer_;
 
   scoped_ptr<SyncSession> session_;
   scoped_ptr<SyncSessionContext> context_;
   std::set<SyncerEvent> syncer_events_;
   base::TimeDelta last_short_poll_interval_received_;
   base::TimeDelta last_long_poll_interval_received_;
   scoped_refptr<ModelSafeWorker> worker_;
 
@@ skipping 3978 matching lines @@
   Add(low_id_);
   Add(high_id_);
   syncer_->SyncShare(this);
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync