| Index: chrome/browser/chromeos/drive/drive_integration_service.h
|
| diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h
|
| index 3c4e12aaa722c67677f5d846afe3f0ae20fa2363..da5bf1a55555fa7d67d69d6a9c2e391efb831443 100644
|
| --- a/chrome/browser/chromeos/drive/drive_integration_service.h
|
| +++ b/chrome/browser/chromeos/drive/drive_integration_service.h
|
| @@ -70,7 +70,7 @@ class DriveIntegrationServiceObserver {
|
| // that are used to integrate Drive to Chrome. The object of this class is
|
| // created per-profile.
|
| class DriveIntegrationService
|
| - : public ProfileKeyedService,
|
| + : public BrowserContextKeyedService,
|
| public google_apis::DriveNotificationObserver {
|
| public:
|
| // test_drive_service, test_cache_root and test_file_system are used by tests
|
| @@ -87,7 +87,7 @@ class DriveIntegrationService
|
| // other functions.
|
| void Initialize();
|
|
|
| - // ProfileKeyedService override:
|
| + // BrowserContextKeyedService override:
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| // Adds and removes the observer.
|
| @@ -180,7 +180,8 @@ class DriveIntegrationService
|
|
|
| // Singleton that owns all instances of DriveIntegrationService and
|
| // associates them with Profiles.
|
| -class DriveIntegrationServiceFactory : public ProfileKeyedServiceFactory {
|
| +class DriveIntegrationServiceFactory
|
| + : public BrowserContextKeyedServiceFactory {
|
| public:
|
| // Factory function used by tests.
|
| typedef base::Callback<DriveIntegrationService*(Profile* profile)>
|
| @@ -224,8 +225,8 @@ class DriveIntegrationServiceFactory : public ProfileKeyedServiceFactory {
|
| DriveIntegrationServiceFactory();
|
| virtual ~DriveIntegrationServiceFactory();
|
|
|
| - // ProfileKeyedServiceFactory:
|
| - virtual ProfileKeyedService* BuildServiceInstanceFor(
|
| + // BrowserContextKeyedServiceFactory:
|
| + virtual BrowserContextKeyedService* BuildServiceInstanceFor(
|
| content::BrowserContext* context) const OVERRIDE;
|
|
|
| FactoryCallback factory_for_test_;
|
|
|