Revert of 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 463fb43706b4eff98f7c1eef0f32a709727fd3e6..9d06e86eec633cd9a241e68665df349ea64a2d7e 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"
@@ -30,7 +30,7 @@
 }  // namespace
 
 int BrowserActionTestUtil::NumberOfBrowserActions() {
-  return GetContainer(browser_)->num_toolbar_actions();
+  return GetContainer(browser_)->num_browser_actions();
 }
 
 int BrowserActionTestUtil::VisibleBrowserActions() {
@@ -38,36 +38,36 @@
 }
 
 void BrowserActionTestUtil::InspectPopup(int index) {
-  ToolbarActionView* view =
-      GetContainer(browser_)->GetToolbarActionViewAt(index);
+  BrowserActionView* view =
+      GetContainer(browser_)->GetBrowserActionViewAt(index);
   static_cast<ExtensionActionViewController*>(view->view_controller())->
       InspectPopup();
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
-  return !GetContainer(browser_)->GetToolbarActionViewAt(index)->
+  return !GetContainer(browser_)->GetBrowserActionViewAt(index)->
       GetImage(views::Button::STATE_NORMAL).isNull();
 }
 
 gfx::Image BrowserActionTestUtil::GetIcon(int index) {
-  gfx::ImageSkia icon = GetContainer(browser_)->GetToolbarActionViewAt(index)->
+  gfx::ImageSkia icon = GetContainer(browser_)->GetBrowserActionViewAt(index)->
       GetIconForTest();
   return gfx::Image(icon);
 }
 
 void BrowserActionTestUtil::Press(int index) {
-  GetContainer(browser_)->GetToolbarActionViewAt(index)->
+  GetContainer(browser_)->GetBrowserActionViewAt(index)->
       view_controller()->ExecuteAction(true);
 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
-  return GetContainer(browser_)->GetToolbarActionViewAt(index)->
+  return GetContainer(browser_)->GetBrowserActionViewAt(index)->
       view_controller()->GetId();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   base::string16 text;
-  GetContainer(browser_)->GetToolbarActionViewAt(index)->
+  GetContainer(browser_)->GetBrowserActionViewAt(index)->
       GetTooltipText(gfx::Point(), &text);
   return base::UTF16ToUTF8(text);
 }