| Index: chrome/browser/extensions/extension_service.h
|
| diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
|
| index 4c133d8ab5861b6f41abfdbb65311b3eaf3afcac..d001e27323caf29e9aa38d66ad88e8d62a156705 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -424,7 +424,7 @@ class ExtensionService
|
| 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(
|
| @@ -596,13 +596,15 @@ class ExtensionService
|
| SyncBundle();
|
| ~SyncBundle();
|
|
|
| + void Reset();
|
| +
|
| bool HasExtensionId(const std::string& id) const;
|
| bool HasPendingExtensionId(const std::string& id) const;
|
|
|
| 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,
|
|
|