Remove references to Profile from browser_context_keyed_service.

chrome/browser/chromeos/drive/drive_integration_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 51 matching lines @@
 
 // DriveIntegrationService is used to integrate Drive to Chrome. This class
 // exposes the file system representation built on top of Drive and some
 // other Drive related objects to the file manager, and some other sub
 // systems.
 //
 // The class is essentially a container that manages lifetime of the objects
 // 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
   // to inject customized instances.
   // Pass NULL or the empty value when not interested.
   DriveIntegrationService(
       Profile* profile,
       google_apis::DriveServiceInterface* test_drive_service,
       const base::FilePath& test_cache_root,
       FileSystemInterface* test_file_system);
   virtual ~DriveIntegrationService();
 
   // Initializes the object. This function should be called before any
   // other functions.
   void Initialize();
 
-  // ProfileKeyedService override:
+  // BrowserContextKeyedService override:
   virtual void Shutdown() OVERRIDE;
 
   // Adds and removes the observer.
   void AddObserver(DriveIntegrationServiceObserver* observer);
   void RemoveObserver(DriveIntegrationServiceObserver* observer);
 
   // google_apis::DriveNotificationObserver implementation.
   virtual void OnNotificationReceived() OVERRIDE;
   virtual void OnPushNotificationEnabled(bool enabled) OVERRIDE;
 
@@ skipping 71 matching lines @@
   ObserverList<DriveIntegrationServiceObserver> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DriveIntegrationService> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(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)>
       FactoryCallback;
 
   // Returns the DriveIntegrationService for |profile|, creating it if it is
   // not yet created.
   //
   // This function starts returning NULL if Drive is disabled, even if this
   // function previously returns a non-NULL object. In other words, clients
@@ skipping 23 matching lines @@
 
   // Sets a factory function for tests.
   static void SetFactoryForTest(const FactoryCallback& factory_for_test);
 
  private:
   friend struct DefaultSingletonTraits<DriveIntegrationServiceFactory>;
 
   DriveIntegrationServiceFactory();
   virtual ~DriveIntegrationServiceFactory();
 
-  // ProfileKeyedServiceFactory:
-  virtual ProfileKeyedService* BuildServiceInstanceFor(
+  // BrowserContextKeyedServiceFactory:
+  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const OVERRIDE;
 
   FactoryCallback factory_for_test_;
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_