Changed change processors to use ScopedStopObserving

chrome/browser/sync/glue/autofill_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/autofill_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 178 matching lines @@
     sync_node.Remove();
   }
 }
 
 void AutofillChangeProcessor::ApplyChangesFromSyncModel(
     const sync_api::BaseTransaction* trans,
     const sync_api::ImmutableChangeRecordList& changes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!running())
     return;
-  StopObserving();
+  ScopedStopObserving<AutofillChangeProcessor> stop_observing(this);
 
   sync_api::ReadNode autofill_root(trans);
   if (!autofill_root.InitByTagLookup(kAutofillTag)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
         "Autofill root node lookup failed.");
     return;
   }
 
   for (sync_api::ChangeRecordList::const_iterator it =
            changes.Get().begin(); it != changes.Get().end(); ++it) {
@@ skipping 32 matching lines @@
     int64 sync_id = sync_node.GetId();
     if (autofill.has_value()) {
       autofill_changes_.push_back(AutofillChangeRecord(it->action,
                                                        sync_id, autofill));
     } else if (autofill.has_profile()) {
       LOG(WARNING) << "Change for old-style autofill profile being dropped!";
     } else {
       NOTREACHED() << "Autofill specifics has no data!";
     }
   }
-
-  StartObserving();
 }
 
 void AutofillChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!running())
     return;
-  StopObserving();
+  ScopedStopObserving<AutofillChangeProcessor> stop_observing(this);
 
   std::vector<AutofillEntry> new_entries;
   for (unsigned int i = 0; i < autofill_changes_.size(); i++) {
     // Handle deletions.
     if (sync_api::ChangeRecord::ACTION_DELETE ==
         autofill_changes_[i].action_) {
       if (autofill_changes_[i].autofill_.has_value()) {
         ApplySyncAutofillEntryDelete(autofill_changes_[i].autofill_);
       } else if (autofill_changes_[i].autofill_.has_profile()) {
         ApplySyncAutofillProfileDelete(autofill_changes_[i].id_);
@@ skipping 22 matching lines @@
   // Make changes
   if (!web_database_->GetAutofillTable()->UpdateAutofillEntries(new_entries)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
                                           "Could not update autofill entries.");
     return;
   }
 
   WebDataService::NotifyOfMultipleAutofillChanges(
       profile_->GetWebDataService(Profile::EXPLICIT_ACCESS));
 
-  StartObserving();
 }
 
 void AutofillChangeProcessor::ApplySyncAutofillEntryDelete(
       const sync_pb::AutofillSpecifics& autofill) {
   if (!web_database_->GetAutofillTable()->RemoveFormElement(
       UTF8ToUTF16(autofill.name()), UTF8ToUTF16(autofill.value()))) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
         "Could not remove autofill node.");
     return;
   }
@@ skipping 125 matching lines @@
   autofill.set_value(UTF16ToUTF8(entry.key().value()));
   const std::vector<base::Time>& ts(entry.timestamps());
   for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
        timestamp != ts.end(); ++timestamp) {
     autofill.add_usage_timestamp(timestamp->ToInternalValue());
   }
   node->SetAutofillSpecifics(autofill);
 }
 
 }  // namespace browser_sync