Consolidate ExtensionAction execution code

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 53b17197acb5ea2056cd72be28946c0542999fed..2b3882fe5442a296c14a0f34f491b5af3971a678 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -759,12 +759,13 @@ class ExtensionServiceObserverBridge
 - (BOOL)browserActionClicked:(BrowserActionButton*)button
                  shouldGrant:(BOOL)shouldGrant {
   const Extension* extension = [button extension];
-  GURL popupUrl;
-  switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl,
-                                              shouldGrant)) {
+  switch (extensions::ExtensionActionAPI::Get(profile_)->ExecuteExtensionAction(
+              extension, browser_, shouldGrant)) {
     case ExtensionAction::ACTION_NONE:
       break;
     case ExtensionAction::ACTION_SHOW_POPUP: {
+      GURL popupUrl = extensions::ExtensionActionManager::Get(profile_)->
+          GetBrowserAction(*extension)->GetPopupUrl([self currentTabId]);
       NSPoint arrowPoint = [self popupPointForBrowserAction:extension];
       [ExtensionPopupController showURL:popupUrl
                               inBrowser:browser_