| Index: chrome/browser/sync/api/syncable_service.h
|
| diff --git a/chrome/browser/sync/api/syncable_service.h b/chrome/browser/sync/api/syncable_service.h
|
| index 6b5152bdeca04e3d49ba39337e48af2e4a528d25..1e1e6a2ccd356a5c681cfc20ca2d9a0631354867 100644
|
| --- a/chrome/browser/sync/api/syncable_service.h
|
| +++ b/chrome/browser/sync/api/syncable_service.h
|
| @@ -9,14 +9,13 @@
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/sync/api/sync_change_processor.h"
|
| #include "chrome/browser/sync/api/sync_data.h"
|
| #include "chrome/browser/sync/api/sync_error.h"
|
| #include "sync/syncable/model_type.h"
|
|
|
| -class SyncData;
|
| -
|
| typedef std::vector<SyncData> SyncDataList;
|
|
|
| // TODO(zea): remove SupportsWeakPtr in favor of having all SyncableService
|
| @@ -37,7 +36,7 @@ class SyncableService : public SyncChangeProcessor,
|
| virtual SyncError MergeDataAndStartSyncing(
|
| syncable::ModelType type,
|
| const SyncDataList& initial_sync_data,
|
| - SyncChangeProcessor* sync_processor) = 0;
|
| + scoped_ptr<SyncChangeProcessor> sync_processor) = 0;
|
|
|
| // Stop syncing the specified type and reset state.
|
| virtual void StopSyncing(syncable::ModelType type) = 0;
|
|
|