Moved ScopeStopObserving to a template class in change_processor.h.

chrome/browser/sync/glue/autofill_profile_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_profile_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 28 matching lines @@
   DCHECK(web_database);
   DCHECK(error_handler);
   DCHECK(personal_data_manager);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   StartObserving();
 }
 
 AutofillProfileChangeProcessor::~AutofillProfileChangeProcessor() {}
 
-AutofillProfileChangeProcessor::ScopedStopObserving::ScopedStopObserving(
-    AutofillProfileChangeProcessor* processor) {
-  processor_ = processor;
-  processor_->StopObserving();
-}
-
-AutofillProfileChangeProcessor::ScopedStopObserving::~ScopedStopObserving() {
-  processor_->StartObserving();
-}
-
 void AutofillProfileChangeProcessor::ApplyChangesFromSyncModel(
     const sync_api::BaseTransaction *write_trans,
     const sync_api::SyncManager::ChangeRecord* changes,
     int change_count) {
 
-  ScopedStopObserving observer(this);
+  ScopedStopObserving<AutofillProfileChangeProcessor> observer(this);
 
   sync_api::ReadNode autofill_profile_root(write_trans);
   if (!autofill_profile_root.InitByTagLookup(kAutofillProfileTag)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
       "Autofill Profile root node lookup failed");
     return;
   }
 
   for (int i = 0; i < change_count; ++i) {
     if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
@@ skipping 92 matching lines @@
       NOTREACHED();
   }
 }
 
 void AutofillProfileChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!running())
     return;
 
-  ScopedStopObserving observer(this);
+  ScopedStopObserving<AutofillProfileChangeProcessor> observer(this);
 
   for (unsigned int i = 0;i < autofill_changes_.size(); ++i) {
     if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
         autofill_changes_[i].action_) {
       if (!web_database_->GetAutofillTable()->RemoveAutofillProfile(
           autofill_changes_[i].profile_specifics_.guid())) {
         LOG(ERROR) << "could not delete the profile " <<
            autofill_changes_[i].profile_specifics_.guid();
         continue;
       }
@@ skipping 158 matching lines @@
   specifics.set_email_address(UTF16ToUTF8(profile.GetInfo(EMAIL_ADDRESS)));
   specifics.set_company_name(UTF16ToUTF8(profile.GetInfo(COMPANY_NAME)));
   specifics.set_phone_fax_whole_number(UTF16ToUTF8(profile.GetInfo(
       PHONE_FAX_WHOLE_NUMBER)));
   specifics.set_phone_home_whole_number(UTF16ToUTF8(profile.GetInfo(
       PHONE_HOME_WHOLE_NUMBER)));
   node->SetAutofillProfileSpecifics(specifics);
 }
 
 }  // namespace browser_sync