[Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

chrome/browser/extensions/extension_service.h

 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 401 matching lines @@
   // put on the blacklist (not to be confused with the Google managed blacklist
   // set of extensions.
   virtual void CheckAdminBlacklist() OVERRIDE;
 
   virtual void CheckForUpdatesSoon() OVERRIDE;
 
   // SyncableService implementation.
   virtual SyncError MergeDataAndStartSyncing(
       syncable::ModelType type,
       const SyncDataList& initial_sync_data,
-      SyncChangeProcessor* sync_processor) OVERRIDE;
+      scoped_ptr<SyncChangeProcessor> sync_processor) OVERRIDE;
   virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
   virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
   virtual SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const SyncChangeList& change_list) OVERRIDE;
 
   void set_extensions_enabled(bool enabled) { extensions_enabled_ = enabled; }
   bool extensions_enabled() { return extensions_enabled_; }
 
   void set_show_extensions_prompts(bool enabled) {
@@ skipping 151 matching lines @@
   extensions::RulesRegistryService* GetRulesRegistryService();
 
   AppShortcutManager* app_shortcut_manager() { return &app_shortcut_manager_; }
 
  private:
   // Bundle of type (app or extension)-specific sync stuff.
   struct SyncBundle {
     SyncBundle();
     ~SyncBundle();
 
+    void Reset();
+
     bool HasExtensionId(const std::string& id) const;
     bool HasPendingExtensionId(const std::string& id) const;
 
+    // Note: all members of the struct need to be explicitly cleared in Reset().
     ExtensionFilter filter;
     std::set<std::string> synced_extensions;
     std::map<std::string, ExtensionSyncData> pending_sync_data;
-    SyncChangeProcessor* sync_processor;
+    scoped_ptr<SyncChangeProcessor> sync_processor;
   };
 
   // Contains Extension data that can change during the life of the process,
   // but does not persist across restarts.
   struct ExtensionRuntimeData {
     // True if the background page is ready.
     bool background_page_ready;
 
     // True while the extension is being upgraded.
     bool being_upgraded;
@@ skipping 230 matching lines @@
   scoped_ptr<ExtensionGlobalError> extension_global_error_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_