Replace changes_channel with an observer list.

chrome/browser/sync/engine/syncer.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/engine/syncer.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/sync/engine/apply_updates_command.h"
@@ skipping 37 matching lines @@
 
 namespace browser_sync {
 
 using sessions::StatusController;
 using sessions::SyncSession;
 using sessions::ConflictProgress;
 
 Syncer::Syncer(sessions::SyncSessionContext* context)
     : early_exit_requested_(false),
       max_commit_batch_size_(kDefaultMaxCommitBatchSize),
-      syncer_event_channel_(new SyncerEventChannel(SyncerEvent(
-          SyncerEvent::SHUTDOWN_USE_WITH_CARE))),
+      syncer_event_channel_(new SyncerEventChannel()),
       resolver_scoper_(context, &resolver_),
       event_channel_scoper_(context, syncer_event_channel_.get()),
       context_(context),
       updates_source_(sync_pb::GetUpdatesCallerInfo::UNKNOWN),
       pre_conflict_resolution_closure_(NULL) {
-  shutdown_channel_.reset(new ShutdownChannel(this));
+  shutdown_channel_.reset(new ShutdownChannel());
 
   ScopedDirLookup dir(context->directory_manager(), context->account_name());
   // The directory must be good here.
   CHECK(dir.good());
 }
 
+Syncer::~Syncer() {
+  syncer_event_channel_->Notify(
+      SyncerEvent(SyncerEvent::SHUTDOWN_USE_WITH_CARE));
+  shutdown_channel_->Notify(SyncerShutdownEvent(this));
+}
+
 void Syncer::RequestNudge(int milliseconds) {
   SyncerEvent event(SyncerEvent::REQUEST_SYNC_NUDGE);
   event.nudge_delay_milliseconds = milliseconds;
-  syncer_event_channel_->NotifyListeners(event);
+  syncer_event_channel_->Notify(event);
 }
 
 bool Syncer::SyncShare(sessions::SyncSession::Delegate* delegate) {
   sessions::SyncSession session(context_, delegate);
   return SyncShare(&session);
 }
 
 bool Syncer::SyncShare(sessions::SyncSession* session) {
   session->set_source(TestAndSetUpdatesSource());
   // This isn't perfect, as we can end up bundling extensions activity
@@ skipping 226 matching lines @@
   entry->Put(SERVER_CTIME, 0);
   entry->Put(SERVER_VERSION, 0);
   entry->Put(SERVER_IS_DIR, false);
   entry->Put(SERVER_IS_DEL, false);
   entry->Put(IS_UNAPPLIED_UPDATE, false);
   entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance());
   entry->Put(SERVER_POSITION_IN_PARENT, 0);
 }
 
 }  // namespace browser_sync