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

chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.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 "base/command_line.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 63 matching lines @@
   // Test that we received the changes.
   int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
   ExtensionAction* action = extension->browser_action();
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
 
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
     ExtensionService* service = browser()->profile()->GetExtensionService();
-    service->toolbar_model()->ExecuteBrowserAction(
-        extension->id(), browser());
+    service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   {
     // Tell the extension to update the page action state again.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update2.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
@@ skipping 15 matching lines @@
   ASSERT_TRUE(page_action)
       << "Page action test extension should have a page action.";
 
   ASSERT_FALSE(page_action->HasPopup(tab_id));
 
   // Simulate the page action being clicked.  The resulting event should
   // install a page action popup.
   {
     ResultCatcher catcher;
     ExtensionService* service = browser()->profile()->GetExtensionService();
-    service->toolbar_model()->ExecuteBrowserAction(
-        extension->id(), browser());
+    service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   ASSERT_TRUE(page_action->HasPopup(tab_id))
       << "Clicking on the page action should have caused a popup to be added.";
 
   ASSERT_STREQ("/a_popup.html",
                page_action->GetPopupUrl(tab_id).path().c_str());
 
   // Now change the popup from a_popup.html to a_second_popup.html .
@@ skipping 45 matching lines @@
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }