Replace changes_channel with an observer list.

chrome/browser/sync/sessions/sync_session_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.
 
 #include "chrome/browser/sync/sessions/sync_session.h"
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
@@ skipping 70 matching lines @@
   }
 
   bool controller_invocations_allowed_;
   scoped_ptr<SyncSession> session_;
   scoped_ptr<SyncSessionContext> context_;
   ModelSafeRoutingInfo routes_;
 };
 
 TEST_F(SyncSessionTest, ScopedContextHelpers) {
   ConflictResolver resolver;
-  SyncerEventChannel* channel = new SyncerEventChannel(
-      SyncerEvent(SyncerEvent::SHUTDOWN_USE_WITH_CARE));
+  SyncerEventChannel* channel = new SyncerEventChannel();
   EXPECT_FALSE(context_->resolver());
   EXPECT_FALSE(context_->syncer_event_channel());
   {
     ScopedSessionContextConflictResolver s_resolver(context_.get(), &resolver);
     ScopedSessionContextSyncerEventChannel s_channel(context_.get(), channel);
     EXPECT_EQ(&resolver, context_->resolver());
     EXPECT_EQ(channel, context_->syncer_event_channel());
   }
   EXPECT_FALSE(context_->resolver());
   EXPECT_FALSE(context_->syncer_event_channel());
+  channel->Notify(SyncerEvent(SyncerEvent::SHUTDOWN_USE_WITH_CARE));
   delete channel;
 }
 
 TEST_F(SyncSessionTest, SetWriteTransaction) {
   TestDirectorySetterUpper db;
   db.SetUp();
   session_.reset(NULL);
   context_.reset(new SyncSessionContext(NULL, NULL, db.manager(), this));
   session_.reset(new SyncSession(context_.get(), this));
   context_->set_account_name(db.name());
@@ skipping 114 matching lines @@
   // Conflict resolution happens after get updates and commit,
   // so we need to loop back and get updates / commit again now
   // that we have made forward progress.
   status()->update_conflicts_resolved(true);
   EXPECT_TRUE(session_->HasMoreToSync());
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync