Changed change processors to use ScopedStopObserving

chrome/browser/sync/glue/session_change_processor.cc

 // Copyright (c) 2011 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/glue/session_change_processor.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 196 matching lines @@
 }
 
 void SessionChangeProcessor::ApplyChangesFromSyncModel(
     const sync_api::BaseTransaction* trans,
     const sync_api::ImmutableChangeRecordList& changes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!running()) {
     return;
   }
 
-  StopObserving();
+  ScopedStopObserving<SessionChangeProcessor> stop_observing(this);
 
   sync_api::ReadNode root(trans);
   if (!root.InitByTagLookup(kSessionsTag)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
         "Sessions root node lookup failed.");
     return;
   }
 
   for (sync_api::ChangeRecordList::const_iterator it =
            changes.Get().begin(); it != changes.Get().end(); ++it) {
@@ skipping 26 matching lines @@
 
     const sync_pb::SessionSpecifics& specifics(
         sync_node.GetSessionSpecifics());
     if (specifics.session_tag() ==
             session_model_associator_->GetCurrentMachineTag() &&
         !setup_for_test_) {
       // We should only ever receive a change to our own machine's session info
       // if encryption was turned on. In that case, the data is still the same,
       // so we can ignore.
       LOG(WARNING) << "Dropping modification to local session.";
-      StartObserving();
       return;
     }
     const base::Time& mtime = sync_node.GetModificationTime();
     // The model associator handles foreign session updates and adds the same.
     session_model_associator_->AssociateForeignSpecifics(specifics, mtime);
   }
 
   // Notify foreign session handlers that there are new sessions.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_FOREIGN_SESSION_UPDATED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
-
-  StartObserving();
 }
 
 void SessionChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   DCHECK(profile_ == NULL);
   profile_ = profile;
   StartObserving();
 }
 
@@ skipping 26 matching lines @@
       content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void SessionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync