summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/drive/drive_integration_service.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 23:25:44 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 23:25:44 +0000
commitf1484c5242850142011c4db4572b9b742f6b56f5 (patch)
tree6cc51ae1fca2aea4a7f76ab9171a4247eff78a9f /chrome/browser/chromeos/drive/drive_integration_service.h
parent59bf05a05ddf1bec2d2a4ad6d38a3338a41b7805 (diff)
downloadchromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.zip
chromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.tar.gz
chromium_src-f1484c5242850142011c4db4572b9b742f6b56f5.tar.bz2
Remove references to Profile from browser_context_keyed_service.
BUG=227219 R=joi@chromium.org Review URL: https://codereview.chromium.org/15517005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/drive_integration_service.h')
-rw-r--r--chrome/browser/chromeos/drive/drive_integration_service.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h
index f8403d7..41a85af 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.h
+++ b/chrome/browser/chromeos/drive/drive_integration_service.h
@@ -69,7 +69,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
@@ -86,7 +86,7 @@ class DriveIntegrationService
// other functions.
void Initialize();
- // ProfileKeyedService override:
+ // BrowserContextKeyedService override:
virtual void Shutdown() OVERRIDE;
// Adds and removes the observer.
@@ -178,7 +178,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)>
@@ -222,8 +223,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_;