Replace ExtensionAction with ExtensionAction2.

chrome/browser/views/browser_actions_container.cc

Index: chrome/browser/views/browser_actions_container.cc
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 6a916909c98a9dfb7670d7c52459f30d571679e3..414e6e9f1e536e52e347f14765562c43ca530b09 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -60,7 +60,7 @@ BrowserActionButton::BrowserActionButton(Extension* extension,
   // should call UpdateState() after creation.
 
   registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
-                 Source<ExtensionAction2>(browser_action_));
+                 Source<ExtensionAction>(browser_action_));
 }
 
 BrowserActionButton::~BrowserActionButton() {
@@ -205,7 +205,7 @@ void BrowserActionView::Layout() {
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
-  ExtensionAction2* action = button()->browser_action();
+  ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
@@ -336,7 +336,7 @@ void BrowserActionsContainer::TestExecuteBrowserAction(int index) {
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
     BrowserActionButton* button) {
-  ExtensionAction2* browser_action = button->browser_action();
+  ExtensionAction* browser_action = button->browser_action();
 
   // Popups just display.  No notification to the extension.
   // TODO(erikkay): should there be?