Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.

chrome/browser/extensions/api/api_resource_manager.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_EXTENSIONS_API_API_RESOURCE_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_API_RESOURCE_MANAGER_H_
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 namespace api {
 class SerialEventDispatcher;
 class TCPServerSocketEventDispatcher;
 class TCPSocketEventDispatcher;
 class UDPSocketEventDispatcher;
 }
 }
@@ skipping 19 matching lines @@
 //   static const BrowserThread::ID kThreadId = BrowserThread::FILE;
 //  private:
 //   friend class ApiResourceManager<Resource>;
 //   static const char* service_name() {
 //     return "ResourceManager";
 //    }
 // };
 //
 // In the cc file:
 //
-// static base::LazyInstance<ProfileKeyedAPIFactory<
+// static base::LazyInstance<BrowserContextKeyedAPIFactory<
 //     ApiResourceManager<Resource> > >
 //         g_factory = LAZY_INSTANCE_INITIALIZER;
 //
 //
 // template <>
-// ProfileKeyedAPIFactory<ApiResourceManager<Resource> >*
+// BrowserContextKeyedAPIFactory<ApiResourceManager<Resource> >*
 // ApiResourceManager<Resource>::GetFactoryInstance() {
 //   return g_factory.Pointer();
 // }
 template <class T>
-class ApiResourceManager : public ProfileKeyedAPI,
+class ApiResourceManager : public BrowserContextKeyedAPI,
                            public base::NonThreadSafe,
                            public content::NotificationObserver {
  public:
   explicit ApiResourceManager(content::BrowserContext* context)
       : thread_id_(T::kThreadId), data_(new ApiResourceData(thread_id_)) {
     registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::NotificationService::AllSources());
     registrar_.Add(
@@ skipping 15 matching lines @@
   virtual ~ApiResourceManager() {
     DCHECK(CalledOnValidThread());
     DCHECK(content::BrowserThread::IsMessageLoopValid(thread_id_)) <<
         "A unit test is using an ApiResourceManager but didn't provide "
         "the thread message loop needed for that kind of resource. "
         "Please ensure that the appropriate message loop is operational.";
 
     data_->InititateCleanup();
   }
 
-  // ProfileKeyedAPI implementation.
-  static ProfileKeyedAPIFactory<ApiResourceManager<T> >* GetFactoryInstance();
+  // BrowserContextKeyedAPI implementation.
+  static BrowserContextKeyedAPIFactory<ApiResourceManager<T> >*
+      GetFactoryInstance();
 
   // Convenience method to get the ApiResourceManager for a profile.
   static ApiResourceManager<T>* Get(content::BrowserContext* context) {
-    return ProfileKeyedAPIFactory<ApiResourceManager<T> >::GetForProfile(
-        context);
+    return BrowserContextKeyedAPIFactory<ApiResourceManager<T> >::Get(context);
   }
 
   // Takes ownership.
   int Add(T* api_resource) {
     return data_->Add(api_resource);
   }
 
   void Remove(const std::string& extension_id, int api_resource_id) {
     data_->Remove(extension_id, api_resource_id);
   }
@@ skipping 25 matching lines @@
         break;
       }
     }
   }
 
  private:
   friend class api::SerialEventDispatcher;
   friend class api::TCPServerSocketEventDispatcher;
   friend class api::TCPSocketEventDispatcher;
   friend class api::UDPSocketEventDispatcher;
-  friend class ProfileKeyedAPIFactory<ApiResourceManager<T> >;
-  // ProfileKeyedAPI implementation.
+  friend class BrowserContextKeyedAPIFactory<ApiResourceManager<T> >;
+  // BrowserContextKeyedAPI implementation.
   static const char* service_name() {
     return T::service_name();
   }
   static const bool kServiceHasOwnInstanceInIncognito = true;
   static const bool kServiceIsNULLWhileTesting = true;
 
   // ApiResourceData class handles resource bookkeeping on a thread
   // where resource lifetime is handled.
   class ApiResourceData : public base::RefCountedThreadSafe<ApiResourceData> {
    public:
@@ skipping 151 matching lines @@
   };
 
   content::BrowserThread::ID thread_id_;
   content::NotificationRegistrar registrar_;
   scoped_refptr<ApiResourceData> data_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_API_RESOURCE_MANAGER_H_