Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.

chrome/browser/extensions/api/commands/command_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_EXTENSIONS_API_COMMANDS_COMMAND_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_COMMANDS_COMMAND_SERVICE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/common/extensions/command.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/common/extension.h"
 
 class Profile;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 class BrowserContext;
 }
 
 namespace ui {
 class Accelerator;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace extensions {
 
 // This service keeps track of preferences related to extension commands
 // (assigning initial keybindings on install and removing them on deletion
 // and answers questions related to which commands are active.
-class CommandService : public ProfileKeyedAPI,
+class CommandService : public BrowserContextKeyedAPI,
                        public content::NotificationObserver {
  public:
   // An enum specifying whether to fetch all extension commands or only active
   // ones.
   enum QueryType {
     ALL,
     ACTIVE_ONLY,
   };
 
   // An enum specifying whether the command is global in scope or not. Global
@@ skipping 12 matching lines @@
     PAGE_ACTION
   };
 
   // Register prefs for keybinding.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Constructs a CommandService object for the given profile.
   explicit CommandService(content::BrowserContext* context);
   virtual ~CommandService();
 
-  // ProfileKeyedAPI implementation.
-  static ProfileKeyedAPIFactory<CommandService>* GetFactoryInstance();
+  // BrowserContextKeyedAPI implementation.
+  static BrowserContextKeyedAPIFactory<CommandService>* GetFactoryInstance();
 
   // Convenience method to get the CommandService for a profile.
   static CommandService* Get(content::BrowserContext* context);
 
   // Returns true if |extension| is permitted to and does remove the bookmark
   // shortcut key.
   static bool RemovesBookmarkShortcut(const extensions::Extension* extension);
 
   // Gets the command (if any) for the browser action of an extension given
   // its |extension_id|. The function consults the master list to see if
@@ skipping 78 matching lines @@
   // Returns true if |extension| is permitted to and does override the bookmark
   // shortcut key.
   bool OverridesBookmarkShortcut(const extensions::Extension* extension) const;
 
   // Overridden from content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
-  friend class ProfileKeyedAPIFactory<CommandService>;
+  friend class BrowserContextKeyedAPIFactory<CommandService>;
 
-  // ProfileKeyedAPI implementation.
+  // BrowserContextKeyedAPI implementation.
   static const char* service_name() {
     return "CommandService";
   }
   static const bool kServiceRedirectedInIncognito = true;
 
   // Assigns initial keybinding for a given |extension|'s page action, browser
   // action and named commands. In each case, if the suggested keybinding is
   // free, it will be taken by this extension. If not, that keybinding request
   // is ignored. |user_pref| is the PrefService used to record the new
   // keybinding assignment.
   void AssignInitialKeybindings(const extensions::Extension* extension);
 
   bool GetExtensionActionCommand(const std::string& extension_id,
                                  QueryType query_type,
                                  extensions::Command* command,
                                  bool* active,
                                  ExtensionCommandType action_type) const;
 
   // The content notification registrar for listening to extension events.
   content::NotificationRegistrar registrar_;
 
   // A weak pointer to the profile we are associated with. Not owned by us.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandService);
 };
 
 template <>
-void ProfileKeyedAPIFactory<CommandService>::DeclareFactoryDependencies();
+void
+    BrowserContextKeyedAPIFactory<CommandService>::DeclareFactoryDependencies();
 
 }  //  namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_COMMANDS_COMMAND_SERVICE_H_