Changed change processors to use ScopedStopObserving

BUG=84918
TEST=none


Review URL: http://codereview.chromium.org/8341094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107989 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync/glue/autofill_change_processor.cc

@@ -196,7 +196,7 @@ void AutofillChangeProcessor::ApplyChangesFromSyncModel(
   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)) {
@@ -249,15 +249,13 @@ void AutofillChangeProcessor::ApplyChangesFromSyncModel(
       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++) {
@@ -300,7 +298,6 @@ void AutofillChangeProcessor::CommitChangesFromSyncModel() {
   WebDataService::NotifyOfMultipleAutofillChanges(
       profile_->GetWebDataService(Profile::EXPLICIT_ACCESS));
 
-  StartObserving();
 }
 
 void AutofillChangeProcessor::ApplySyncAutofillEntryDelete(

chrome/browser/sync/glue/autofill_change_processor.h

@@ -70,6 +70,7 @@ class AutofillChangeProcessor : public ChangeProcessor,
   virtual void StopImpl() OVERRIDE;
 
  private:
+  friend class ScopedStopObserving<AutofillChangeProcessor>;
   void StartObserving();
   void StopObserving();
 

chrome/browser/sync/glue/password_change_processor.cc

@@ -197,7 +197,7 @@ 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_,
@@ -209,8 +209,6 @@ void PasswordChangeProcessor::CommitChangesFromSyncModel() {
   deleted_passwords_.clear();
   new_passwords_.clear();
   updated_passwords_.clear();
-
-  StartObserving();
 }
 
 void PasswordChangeProcessor::StartImpl(Profile* profile) {

chrome/browser/sync/glue/password_change_processor.h

@@ -58,6 +58,7 @@ class PasswordChangeProcessor : public ChangeProcessor,
   virtual void StopImpl() OVERRIDE;
 
  private:
+  friend class ScopedStopObserving<PasswordChangeProcessor>;
   void StartObserving();
   void StopObserving();
 

chrome/browser/sync/glue/session_change_processor.cc

@@ -214,7 +214,7 @@ void SessionChangeProcessor::ApplyChangesFromSyncModel(
     return;
   }
 
-  StopObserving();
+  ScopedStopObserving<SessionChangeProcessor> stop_observing(this);
 
   sync_api::ReadNode root(trans);
   if (!root.InitByTagLookup(kSessionsTag)) {
@@ -261,7 +261,6 @@ void SessionChangeProcessor::ApplyChangesFromSyncModel(
       // 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();
@@ -274,8 +273,6 @@ void SessionChangeProcessor::ApplyChangesFromSyncModel(
       chrome::NOTIFICATION_FOREIGN_SESSION_UPDATED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
-
-  StartObserving();
 }
 
 void SessionChangeProcessor::StartImpl(Profile* profile) {

chrome/browser/sync/glue/session_change_processor.h

@@ -57,6 +57,7 @@ class SessionChangeProcessor : public ChangeProcessor,
   virtual void StopImpl() OVERRIDE;
 
  private:
+  friend class ScopedStopObserving<SessionChangeProcessor>;
   void StartObserving();
   void StopObserving();
   SessionModelAssociator* session_model_associator_;

chrome/browser/sync/glue/theme_change_processor.cc

@@ -106,9 +106,8 @@ void ThemeChangeProcessor::ApplyChangesFromSyncModel(
     DCHECK(profile_);
     theme_specifics = node.GetThemeSpecifics();
   }
-  StopObserving();
+  ScopedStopObserving<ThemeChangeProcessor> stop_observing(this);
   SetCurrentThemeFromThemeSpecificsIfNecessary(theme_specifics, profile_);
-  StartObserving();
 }
 
 void ThemeChangeProcessor::StartImpl(Profile* profile) {

chrome/browser/sync/glue/theme_change_processor.h

@@ -47,6 +47,7 @@ class ThemeChangeProcessor : public ChangeProcessor,
   virtual void StopImpl() OVERRIDE;
 
  private:
+  friend class ScopedStopObserving<ThemeChangeProcessor>;
   void StartObserving();
   void StopObserving();
 

chrome/browser/sync/glue/typed_url_change_processor.cc

@@ -307,7 +307,9 @@ void TypedUrlChangeProcessor::CommitChangesFromSyncModel() {
   if (!running())
     return;
 
-  StopObserving();
+  // Make sure we stop listening for changes while we're modifying the backend,
+  // so we don't try to re-apply these changes to the sync DB.
+  ScopedStopObserving<TypedUrlChangeProcessor> stop_observing(this);
   if (!pending_deleted_urls_.empty())
     history_backend_->DeleteURLs(pending_deleted_urls_);
 
@@ -327,8 +329,6 @@ void TypedUrlChangeProcessor::CommitChangesFromSyncModel() {
   pending_new_visits_.clear();
   pending_deleted_visits_.clear();
   pending_deleted_urls_.clear();
-
-  StartObserving();
 }
 
 void TypedUrlChangeProcessor::StartImpl(Profile* profile) {

chrome/browser/sync/glue/typed_url_change_processor.h

@@ -68,6 +68,7 @@ class TypedUrlChangeProcessor : public ChangeProcessor,
   virtual void StopImpl();
 
  private:
+  friend class ScopedStopObserving<TypedUrlChangeProcessor>;
   void StartObserving();
   void StopObserving();