| Index: chrome/browser/sync/profile_sync_service_factory.h
|
| diff --git a/chrome/browser/sync/profile_sync_service_factory.h b/chrome/browser/sync/profile_sync_service_factory.h
|
| index 17b1f2dc83b348e7d07cb9fa2054f9703dd79bc5..1ae0f4988afa5510a0d7aefa384d191c3d87cf54 100644
|
| --- a/chrome/browser/sync/profile_sync_service_factory.h
|
| +++ b/chrome/browser/sync/profile_sync_service_factory.h
|
| @@ -5,38 +5,36 @@
|
| #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_FACTORY_H_
|
| #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_FACTORY_H_
|
|
|
| -#include <memory>
|
| -
|
| #include "base/macros.h"
|
| #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
|
|
|
| -class Profile;
|
| -
|
| namespace base {
|
| template <typename T>
|
| struct DefaultSingletonTraits;
|
| -} // namespace base
|
| +}
|
|
|
| namespace browser_sync {
|
| class ProfileSyncService;
|
| } // namespace browser_sync
|
|
|
| -namespace syncer {
|
| +namespace sync_driver {
|
| class SyncClient;
|
| class SyncService;
|
| -} // namespace syncer
|
| +}
|
| +
|
| +class Profile;
|
|
|
| class ProfileSyncServiceFactory : public BrowserContextKeyedServiceFactory {
|
| public:
|
| - typedef base::Callback<std::unique_ptr<syncer::SyncClient>(Profile*)>
|
| + typedef base::Callback<std::unique_ptr<sync_driver::SyncClient>(Profile*)>
|
| SyncClientFactory;
|
|
|
| static browser_sync::ProfileSyncService* GetForProfile(Profile* profile);
|
| static bool HasProfileSyncService(Profile* profile);
|
|
|
| // Convenience method that returns the ProfileSyncService as a
|
| - // syncer::SyncService.
|
| - static syncer::SyncService* GetSyncServiceForBrowserContext(
|
| + // sync_driver::SyncService.
|
| + static sync_driver::SyncService* GetSyncServiceForBrowserContext(
|
| content::BrowserContext* context);
|
|
|
| static ProfileSyncServiceFactory* GetInstance();
|
|
|