Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.

chrome/browser/extensions/api/preference/preference_api.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_PREFERENCE_PREFERENCE_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_PREFERENCE_PREFERENCE_API_H__
 
 #include <string>
 
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "content/public/browser/notification_observer.h"
+#include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs_scope.h"
 
 class ExtensionPrefValueMap;
 class PrefService;
 
 namespace base {
 class Value;
 }
 
@@ skipping 57 matching lines @@
                                 const std::string& pref_key,
                                 bool* from_incognito);
 
  protected:
   // Virtual for testing.
   virtual ExtensionPrefs* extension_prefs() = 0;
   virtual ExtensionPrefValueMap* extension_pref_value_map() = 0;
 };
 
 class PreferenceAPI : public PreferenceAPIBase,
-                      public ProfileKeyedAPI,
+                      public BrowserContextKeyedAPI,
                       public EventRouter::Observer,
                       public ContentSettingsStore::Observer {
  public:
   explicit PreferenceAPI(content::BrowserContext* context);
   virtual ~PreferenceAPI();
 
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
-  // ProfileKeyedAPI implementation.
-  static ProfileKeyedAPIFactory<PreferenceAPI>* GetFactoryInstance();
+  // BrowserContextKeyedAPI implementation.
+  static BrowserContextKeyedAPIFactory<PreferenceAPI>* GetFactoryInstance();
 
   // Convenience method to get the PreferenceAPI for a profile.
   static PreferenceAPI* Get(content::BrowserContext* context);
 
   // EventRouter::Observer implementation.
   virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE;
 
   // Loads the preferences controlled by the specified extension from their
   // dictionary and sets them in the |value_map|.
   static void LoadExtensionControlledPrefs(ExtensionPrefs* prefs,
                                            ExtensionPrefValueMap* value_map,
                                            const std::string& extension_id,
                                            ExtensionPrefsScope scope);
 
   // Store extension controlled preference values in the |value_map|,
   // which then informs the subscribers (ExtensionPrefStores) about the winning
   // values.
   static void InitExtensionControlledPrefs(ExtensionPrefs* prefs,
                                            ExtensionPrefValueMap* value_map);
 
  private:
-  friend class ProfileKeyedAPIFactory<PreferenceAPI>;
+  friend class BrowserContextKeyedAPIFactory<PreferenceAPI>;
 
   // ContentSettingsStore::Observer implementation.
   virtual void OnContentSettingChanged(const std::string& extension_id,
                                        bool incognito) OVERRIDE;
 
   // Clears incognito session-only content settings for all extensions.
   void ClearIncognitoSessionOnlyContentSettings();
 
   // PreferenceAPIBase implementation.
   virtual ExtensionPrefs* extension_prefs() OVERRIDE;
   virtual ExtensionPrefValueMap* extension_pref_value_map() OVERRIDE;
 
   Profile* profile_;
 
-  // ProfileKeyedAPI implementation.
+  // BrowserContextKeyedAPI implementation.
   static const char* service_name() {
     return "PreferenceAPI";
   }
   static const bool kServiceIsNULLWhileTesting = true;
   static const bool kServiceRedirectedInIncognito = true;
 
   // Created lazily upon OnListenerAdded.
   scoped_ptr<PreferenceEventRouter> preference_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferenceAPI);
@@ skipping 67 matching lines @@
  protected:
   virtual ~ClearPreferenceFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_PREFERENCE_PREFERENCE_API_H__