Changed change processors to use ScopedStopObserving

chrome/browser/sync/glue/password_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/password_change_processor.h"
 
 #include <string>
 
 #include "base/location.h"
 #include "base/string_util.h"
@@ skipping 179 matching lines @@
       DCHECK_EQ(sync_api::ChangeRecord::ACTION_UPDATE, it->action);
       updated_passwords_.push_back(password);
     }
   }
 }
 
 void PasswordChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(expected_loop_ == MessageLoop::current());
   if (!running())
     return;
-  StopObserving();
+  ScopedStopObserving<PasswordChangeProcessor> stop_observing(this);
 
   if (!model_associator_->WriteToPasswordStore(&new_passwords_,
                                                &updated_passwords_,
                                                &deleted_passwords_)) {
     error_handler()->OnUnrecoverableError(FROM_HERE, "Error writing passwords");
     return;
   }
 
   deleted_passwords_.clear();
   new_passwords_.clear();
   updated_passwords_.clear();
-
-  StartObserving();
 }
 
 void PasswordChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(expected_loop_ == MessageLoop::current());
   observing_ = true;
 }
 
 void PasswordChangeProcessor::StopImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observing_ = false;
 }
 
 
 void PasswordChangeProcessor::StartObserving() {
   DCHECK(expected_loop_ == MessageLoop::current());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGINS_CHANGED,
                               content::Source<PasswordStore>(password_store_));
 }
 
 void PasswordChangeProcessor::StopObserving() {
   DCHECK(expected_loop_ == MessageLoop::current());
   notification_registrar_.Remove(
       this,
       chrome::NOTIFICATION_LOGINS_CHANGED,
       content::Source<PasswordStore>(password_store_));
 }
 
 }  // namespace browser_sync