Moved ScopeStopObserving to a template class in change_processor.h.

chrome/browser/sync/glue/autofill_profile_change_processor.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_CHANGE_PROCESSOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_CHANGE_PROCESSOR_H_
 #pragma once
 #include <string>
 #include <vector>
 
@@ skipping 62 matching lines @@
 
   virtual void AddAutofillProfileSyncNode(sync_api::WriteTransaction* trans,
       sync_api::BaseNode& autofill_profile_root,
       const AutofillProfile& profile);
 
   void ActOnChange(AutofillProfileChange* change,
       sync_api::WriteTransaction* trans,
       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();
 
   void PostOptimisticRefreshTask();
 
   void ApplyAutofillProfileChange(
     sync_api::SyncManager::ChangeRecord::Action action,
     const sync_pb::AutofillProfileSpecifics& profile,
     int64 sync_id);
 
   void RemoveSyncNode(
       const std::string& guid, sync_api::WriteTransaction *trans);
 
   AutofillProfileModelAssociator* model_associator_;
   bool observing_;
 
   WebDatabase* web_database_;
   PersonalDataManager* personal_data_;
   NotificationRegistrar notification_registrar_;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_CHANGE_PROCESSOR_H_
-