Move logic to clear ExtensionAction values to ExtensionActionAPI

chrome/browser/extensions/extension_action_manager.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_action_manager.h"
 
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 
 namespace extensions {
 
 namespace {
 
 // BrowserContextKeyedServiceFactory for ExtensionActionManager.
 class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {
  public:
   // BrowserContextKeyedServiceFactory implementation:
-  static ExtensionActionManager* GetForProfile(Profile* profile) {
+  static ExtensionActionManager* GetForBrowserContext(
+      content::BrowserContext* context) {
     return static_cast<ExtensionActionManager*>(
-        GetInstance()->GetServiceForBrowserContext(profile, true));
+        GetInstance()->GetServiceForBrowserContext(context, true));
   }
 
   static ExtensionActionManagerFactory* GetInstance();
 
  private:
   friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>;
 
   ExtensionActionManagerFactory()
       : BrowserContextKeyedServiceFactory(
           "ExtensionActionManager",
@@ skipping 23 matching lines @@
   CHECK_EQ(profile, profile->GetOriginalProfile())
       << "Don't instantiate this with an incognito profile.";
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
 }
 
 ExtensionActionManager::~ExtensionActionManager() {
   // Don't assert that the ExtensionAction maps are empty because Extensions are
   // sometimes (only in tests?) not unloaded before the Profile is destroyed.
 }
 
-ExtensionActionManager* ExtensionActionManager::Get(Profile* profile) {
-  return ExtensionActionManagerFactory::GetForProfile(profile);
+ExtensionActionManager* ExtensionActionManager::Get(
+    content::BrowserContext* context) {
+  return ExtensionActionManagerFactory::GetForBrowserContext(context);
 }
 
 void ExtensionActionManager::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   page_actions_.erase(extension->id());
   browser_actions_.erase(extension->id());
   system_indicators_.erase(extension->id());
 }
@@ skipping 113 matching lines @@
   if (!extensions::SystemIndicatorManagerFactory::GetForProfile(profile_))
     return NULL;
 
   return GetOrCreateOrNull(&system_indicators_, extension,
                            ActionInfo::TYPE_SYSTEM_INDICATOR,
                            ActionInfo::GetSystemIndicatorInfo(&extension),
                            profile_);
 }
 
 }  // namespace extensions