Make a platform-independent ToolbarActionViewController

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"
@@ skipping 18 matching lines @@
   // ToolbarActionButtonController:
   const std::string& GetId() const override { return id_; }
   void SetDelegate(ToolbarActionViewDelegate* delegate) override {}
   gfx::Image GetIcon(content::WebContents* web_contents) override {
     return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_BROWSER_ACTION);
   }
   gfx::ImageSkia GetIconWithBadge() override {
     return *GetIcon(nullptr).ToImageSkia();
   }
-  base::string16 GetAccessibleName(
-      content::WebContents* web_contents) const override {
+  base::string16 GetActionName() const override {
     return base::ASCIIToUTF16("Component Action");
   }
-  base::string16 GetTooltip(content::WebContents* web_contents) const override {
-    return GetAccessibleName(web_contents);
+  base::string16 GetAccessibleName(content::WebContents* web_contents)
+      const override {
+    return GetActionName();
+  }
+  base::string16 GetTooltip(content::WebContents* web_contents)
+      const override {
+    return GetActionName();
   }
   bool IsEnabled(content::WebContents* web_contents) const override {
     return true;
   }
   bool HasPopup(content::WebContents* web_contents) const override {
     return true;
   }
   void HidePopup() override {}
   gfx::NativeView GetPopupNativeView() override { return nullptr; }
   bool CanDrag() const override { return false; }
@@ skipping 77 matching lines @@
       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());
 }