Replace changes_channel with an observer list.

chrome/browser/sync/engine/all_status.cc

 // Copyright (c) 2006-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/all_status.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/port.h"
@@ skipping 32 matching lines @@
 static const AllStatusEvent shutdown_event =
   { AllStatusEvent::SHUTDOWN, init_status };
 
 AllStatus::AllStatus() : status_(init_status),
                          channel_(new Channel(shutdown_event)) {
   status_.initial_sync_ended = true;
   status_.notifications_enabled = false;
 }
 
 AllStatus::~AllStatus() {
+  syncer_thread_hookup_.reset();
   delete channel_;
 }
 
 void AllStatus::WatchConnectionManager(ServerConnectionManager* conn_mgr) {
   conn_mgr_hookup_.reset(NewEventListenerHookup(conn_mgr->channel(), this,
                          &AllStatus::HandleServerConnectionEvent));
 }
 
 void AllStatus::WatchSyncerThread(SyncerThread* syncer_thread) {
   syncer_thread_hookup_.reset(
-      NewEventListenerHookup(syncer_thread->relay_channel(), this,
-                             &AllStatus::HandleSyncerEvent));
+      syncer_thread->relay_channel()->AddObserver(this));
 }
 
 AllStatus::Status AllStatus::CreateBlankStatus() const {
   Status status = status_;
   status.syncing = true;
   status.unsynced_count = 0;
   status.conflicting_count = 0;
   status.initial_sync_ended = false;
   status.syncer_stuck = false;
   status.max_consecutive_errors = 0;
@@ skipping 105 matching lines @@
       } else {
         lock.set_notify_plan(DONT_NOTIFY);
       }
       break;
     default:
       lock.set_notify_plan(DONT_NOTIFY);
       break;
   }
 }
 
-void AllStatus::HandleSyncerEvent(const SyncerEvent& event) {
+void AllStatus::HandleChannelEvent(const SyncerEvent& event) {
   ScopedStatusLockWithNotify lock(this);
   switch (event.what_happened) {
     case SyncerEvent::COMMITS_SUCCEEDED:
       break;
     case SyncerEvent::SYNC_CYCLE_ENDED:
     case SyncerEvent::STATUS_CHANGED:
       status_ = CalcSyncing(event);
       break;
     case SyncerEvent::SHUTDOWN_USE_WITH_CARE:
       // We're safe to use this value here because we don't call into the syncer
       // or block on any processes.
       lock.set_notify_plan(DONT_NOTIFY);
+      syncer_thread_hookup_.reset();
       break;
     case SyncerEvent::OVER_QUOTA:
       LOG(WARNING) << "User has gone over quota.";
       lock.NotifyOverQuota();
       break;
     case SyncerEvent::REQUEST_SYNC_NUDGE:
       lock.set_notify_plan(DONT_NOTIFY);
       break;
     case SyncerEvent::PAUSED:
       lock.set_notify_plan(DONT_NOTIFY);
@@ skipping 78 matching lines @@
   allstatus_->mutex_.Release();
   if (event_.what_changed)
     allstatus_->channel()->NotifyListeners(event_);
 }
 
 void ScopedStatusLockWithNotify::NotifyOverQuota() {
   event_.what_changed |= AllStatusEvent::OVER_QUOTA;
 }
 
 }  // namespace browser_sync