Resubmit: Rename BrowserActionView to ToolbarActionView

chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

Index: chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
index 97db86206280c2dadf833faa75e4e2f10f726096..af686cf52a572a69a1ce0a3c6685aade418b87b3 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/browser_window_testing_views.h"
 #include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
-#include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
@@ -31,7 +31,7 @@ BrowserActionsContainer* GetContainer(Browser* browser) {
 }  // namespace
 
 int BrowserActionTestUtil::NumberOfBrowserActions() {
-  return GetContainer(browser_)->num_browser_actions();
+  return GetContainer(browser_)->num_toolbar_actions();
 }
 
 int BrowserActionTestUtil::VisibleBrowserActions() {
@@ -39,36 +39,36 @@ int BrowserActionTestUtil::VisibleBrowserActions() {
 }
 
 void BrowserActionTestUtil::InspectPopup(int index) {
-  BrowserActionView* view =
-      GetContainer(browser_)->GetBrowserActionViewAt(index);
+  ToolbarActionView* view =
+      GetContainer(browser_)->GetToolbarActionViewAt(index);
   static_cast<ExtensionActionViewController*>(view->view_controller())->
       InspectPopup();
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
-  return !GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  return !GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetImage(views::Button::STATE_NORMAL).isNull();
 }
 
 gfx::Image BrowserActionTestUtil::GetIcon(int index) {
-  gfx::ImageSkia icon = GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  gfx::ImageSkia icon = GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetIconForTest();
   return gfx::Image(icon);
 }
 
 void BrowserActionTestUtil::Press(int index) {
-  GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  GetContainer(browser_)->GetToolbarActionViewAt(index)->
       view_controller()->ExecuteAction(true);
 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
-  return GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  return GetContainer(browser_)->GetToolbarActionViewAt(index)->
       view_controller()->GetId();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   base::string16 text;
-  GetContainer(browser_)->GetBrowserActionViewAt(index)->
+  GetContainer(browser_)->GetToolbarActionViewAt(index)->
       GetTooltipText(gfx::Point(), &text);
   return base::UTF16ToUTF8(text);
 }