4 files changed, 14 insertions, 12 deletions
diff --git a/chrome/browser/thumbnails/thumbnail_service.h b/chrome/browser/thumbnails/thumbnail_service.h
index 6c0eacf..9c7e395 100644
--- a/chrome/browser/thumbnails/thumbnail_service.h
+++ b/chrome/browser/thumbnails/thumbnail_service.h
@@ -22,7 +22,7 @@ struct ThumbnailingContext;
 // An interface abstracting access to thumbnails. Intended as a temporary
 // bridge facilitating switch from TopSites as the thumbnail source to a more
 // robust way of handling these artefacts.
-class ThumbnailService : public RefcountedProfileKeyedService {
+class ThumbnailService : public RefcountedBrowserContextKeyedService {
  public:
   // Sets the given thumbnail for the given URL. Returns true if the thumbnail
   // was updated. False means either the URL wasn't known to us, or we felt
diff --git a/chrome/browser/thumbnails/thumbnail_service_factory.cc b/chrome/browser/thumbnails/thumbnail_service_factory.cc
index 9a2592e..8c7de72 100644
--- a/chrome/browser/thumbnails/thumbnail_service_factory.cc
+++ b/chrome/browser/thumbnails/thumbnail_service_factory.cc
@@ -13,9 +13,9 @@ using thumbnails::ThumbnailService;
 using thumbnails::ThumbnailServiceImpl;
 
 ThumbnailServiceFactory::ThumbnailServiceFactory()
-    : RefcountedProfileKeyedServiceFactory(
+    : RefcountedBrowserContextKeyedServiceFactory(
           "ThumbnailService",
-          ProfileDependencyManager::GetInstance()) {
+          BrowserContextDependencyManager::GetInstance()) {
 }
 
 ThumbnailServiceFactory::~ThumbnailServiceFactory() {
@@ -25,7 +25,7 @@ ThumbnailServiceFactory::~ThumbnailServiceFactory() {
 scoped_refptr<ThumbnailService> ThumbnailServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<ThumbnailService*>(
-      GetInstance()->GetServiceForProfile(profile, true).get());
+      GetInstance()->GetServiceForBrowserContext(profile, true).get());
 }
 
 // static
@@ -33,9 +33,9 @@ ThumbnailServiceFactory* ThumbnailServiceFactory::GetInstance() {
   return Singleton<ThumbnailServiceFactory>::get();
 }
 
-scoped_refptr<RefcountedProfileKeyedService>
+scoped_refptr<RefcountedBrowserContextKeyedService>
     ThumbnailServiceFactory::BuildServiceInstanceFor(
         content::BrowserContext* profile) const {
-  return scoped_refptr<RefcountedProfileKeyedService>(
+  return scoped_refptr<RefcountedBrowserContextKeyedService>(
       new ThumbnailServiceImpl(static_cast<Profile*>(profile)));
 }
diff --git a/chrome/browser/thumbnails/thumbnail_service_factory.h b/chrome/browser/thumbnails/thumbnail_service_factory.h
index 655cfa6..6249ef1 100644
--- a/chrome/browser/thumbnails/thumbnail_service_factory.h
+++ b/chrome/browser/thumbnails/thumbnail_service_factory.h
@@ -15,14 +15,16 @@ namespace thumbnails {
 class ThumbnailService;
 }
 
-class ThumbnailServiceFactory : public RefcountedProfileKeyedServiceFactory {
+class ThumbnailServiceFactory
+    : public RefcountedBrowserContextKeyedServiceFactory {
  public:
   // Returns an instance of ThumbnailService associated with this profile
   // (creating one if none exists). Returns NULL if this profile cannot have a
   // ThumbnailService (for example, if |profile| is incognito).
   // Depending on the settings, the implementation of the service interface
   // can be provided either by TopSites (stored in the profile itself) or
-  // be an instance of a real RefcountedProfileKeyedService implementation.
+  // be an instance of a real RefcountedBrowserContextKeyedService
+  // implementation.
   static scoped_refptr<thumbnails::ThumbnailService> GetForProfile(
       Profile* profile);
 
@@ -34,9 +36,9 @@ class ThumbnailServiceFactory : public RefcountedProfileKeyedServiceFactory {
   ThumbnailServiceFactory();
   virtual ~ThumbnailServiceFactory();
 
-  // ProfileKeyedServiceFactory:
-  virtual scoped_refptr<RefcountedProfileKeyedService> BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+  // BrowserContextKeyedServiceFactory:
+  virtual scoped_refptr<RefcountedBrowserContextKeyedService>
+      BuildServiceInstanceFor(content::BrowserContext* profile) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ThumbnailServiceFactory);
 };
diff --git a/chrome/browser/thumbnails/thumbnail_service_impl.h b/chrome/browser/thumbnails/thumbnail_service_impl.h
index 0205aac..7d01d00 100644
--- a/chrome/browser/thumbnails/thumbnail_service_impl.h
+++ b/chrome/browser/thumbnails/thumbnail_service_impl.h
@@ -31,7 +31,7 @@ class ThumbnailServiceImpl : public ThumbnailService {
       scoped_refptr<base::RefCountedMemory>* bytes) OVERRIDE;
   virtual bool ShouldAcquirePageThumbnail(const GURL& url) OVERRIDE;
 
-  // Implementation of RefcountedProfileKeyedService.
+  // Implementation of RefcountedBrowserContextKeyedService.
   virtual void ShutdownOnUIThread() OVERRIDE;
 
  private: