Moved ScopeStopObserving to a template class in change_processor.h.

chrome/browser/sync/glue/autofill_profile_change_processor.h

Index: chrome/browser/sync/glue/autofill_profile_change_processor.h
diff --git a/chrome/browser/sync/glue/autofill_profile_change_processor.h b/chrome/browser/sync/glue/autofill_profile_change_processor.h
index 9b08d3d7c41636f1217fa07aab8d8a882c0ad042..0a15bc8502b554e46c35e9d80c0c5cd36fef46bd 100644
--- a/chrome/browser/sync/glue/autofill_profile_change_processor.h
+++ b/chrome/browser/sync/glue/autofill_profile_change_processor.h
@@ -80,19 +80,7 @@ class AutofillProfileChangeProcessor : public ChangeProcessor,
       sync_api::ReadNode& autofill_root);
 
  private:
-
-  // This ensures that startobsrving gets called after stopobserving even
-  // if there is an early return in the function.
-  // TODO(lipalani) - generalize this and add it to other change processors.
-  class ScopedStopObserving {
-   public:
-    explicit ScopedStopObserving(AutofillProfileChangeProcessor* processor);
-    ~ScopedStopObserving();
-
-   private:
-    ScopedStopObserving() {}
-    AutofillProfileChangeProcessor* processor_;
-  };
+  friend class ScopedStopObserving<AutofillProfileChangeProcessor>;
 
   void StartObserving();
   void StopObserving();
@@ -118,4 +106,3 @@ class AutofillProfileChangeProcessor : public ChangeProcessor,
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_CHANGE_PROCESSOR_H_
-