Pull browser action click logic into ToolbarModelController, so that when I

chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

Index: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 5f7070cfef3aa1882177cc5c5dd40ff7d676ef24..3eb8730b0b49fe2be46c1541ad4e6403ce6ae3ec 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -77,8 +77,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
       test_server()->GetURL("files/extensions/test_file.txt"));
 
   ExtensionService* service = browser()->profile()->GetExtensionService();
-  service->toolbar_model()->ExecuteBrowserAction(
-      action->extension_id(), browser());
+  service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
 
   // Verify the command worked.
   WebContents* tab = browser()->GetSelectedWebContents();
@@ -402,7 +401,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DISABLED_CloseBackgroundPage) {
 
   // Click the browser action.
   browser()->profile()->GetExtensionService()->toolbar_model()->
-      ExecuteBrowserAction(action->extension_id(), browser());
+      ExecuteBrowserAction(extension, browser(), NULL);
 
   // It can take a moment for the background page to actually get destroyed
   // so we wait for the notification before checking that it's really gone