| Index: chrome/browser/sync/profile_sync_components_factory.h
|
| diff --git a/chrome/browser/sync/profile_sync_components_factory.h b/chrome/browser/sync/profile_sync_components_factory.h
|
| index 1fa27b13803c31d30bcbd712cd5f6588b71f07f0..8abd964c9e46364f5ab1345e4625cfa249a5d968 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory.h
|
| +++ b/chrome/browser/sync/profile_sync_components_factory.h
|
| @@ -15,7 +15,6 @@
|
|
|
| class PasswordStore;
|
| class ProfileSyncService;
|
| -class SyncableService;
|
| class WebDataService;
|
|
|
| namespace browser_sync {
|
| @@ -28,9 +27,13 @@ class SyncBackendHost;
|
| class DataTypeErrorHandler;
|
| }
|
|
|
| +namespace csync {
|
| +class SyncableService;
|
| +}
|
| +
|
| namespace history {
|
| class HistoryBackend;
|
| -};
|
| +}
|
|
|
| // Factory class for all profile sync related classes.
|
| class ProfileSyncComponentsFactory {
|
| @@ -42,7 +45,7 @@ class ProfileSyncComponentsFactory {
|
| //
|
| // Note: This interface is deprecated in favor of the SyncableService API.
|
| // New datatypes that do not live on the UI thread should directly return a
|
| - // weak pointer to a SyncableService. All others continue to return
|
| + // weak pointer to a csync::SyncableService. All others continue to return
|
| // SyncComponents. It is safe to assume that the factory methods below are
|
| // called on the same thread in which the datatype resides.
|
| //
|
| @@ -73,7 +76,7 @@ class ProfileSyncComponentsFactory {
|
| virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor(
|
| ProfileSyncService* profile_sync_service,
|
| browser_sync::DataTypeErrorHandler* error_handler,
|
| - const base::WeakPtr<SyncableService>& local_service) = 0;
|
| + const base::WeakPtr<csync::SyncableService>& local_service) = 0;
|
|
|
| virtual browser_sync::SharedChangeProcessor*
|
| CreateSharedChangeProcessor() = 0;
|
| @@ -81,7 +84,7 @@ class ProfileSyncComponentsFactory {
|
| // Returns a weak pointer to the syncable service specified by |type|.
|
| // Weak pointer may be unset if service is already destroyed.
|
| // Note: Should only be called on the same thread on which a datatype resides.
|
| - virtual base::WeakPtr<SyncableService> GetSyncableServiceForType(
|
| + virtual base::WeakPtr<csync::SyncableService> GetSyncableServiceForType(
|
| syncable::ModelType type) = 0;
|
|
|
| // Legacy datatypes that need to be converted to the SyncableService API.
|
|
|