Resubmit: Rename BrowserActionView to ToolbarActionView

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

 // Copyright 2014 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/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.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 "chrome/test/base/in_process_browser_test.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 const char kMockId[] = "mock_action";
 
@@ skipping 95 matching lines @@
 
 // Test that Component Toolbar Actions appear in the browser actions container
 // and can receive click events properly.
 IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
                        ComponentToolbarActionsShowUpAndRespondToClicks) {
   BrowserActionsContainer* browser_actions_container =
       BrowserView::GetBrowserViewForBrowser(browser())
           ->toolbar()->browser_actions();
 
   // There should be only one component action view.
-  ASSERT_EQ(1u, browser_actions_container->num_browser_actions());
+  ASSERT_EQ(1u, browser_actions_container->num_toolbar_actions());
 
-  BrowserActionView* view =
-      browser_actions_container->GetBrowserActionViewAt(0u);
+  ToolbarActionView* view =
+      browser_actions_container->GetToolbarActionViewAt(0u);
   ASSERT_EQ(kMockId, view->view_controller()->GetId());
   MockComponentAction* mock_component_action =
       static_cast<MockComponentAction*>(view->view_controller());
 
   // Test that clicking on the component action works.
   EXPECT_EQ(0u, mock_component_action->click_count());
   view->Activate();
   EXPECT_EQ(1u, mock_component_action->click_count());
 }