Make a platform-independent ToolbarActionViewController

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

Index: chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
diff --git a/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc b/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
index 131f5c5679f19ee43b757b0a0713a04a122a073c..014a6feee622b439c578298009d57b704715abf2 100644
--- a/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
@@ -36,13 +36,16 @@ class MockComponentAction : public ToolbarActionViewController {
   virtual gfx::ImageSkia GetIconWithBadge() override {
     return *GetIcon(nullptr).ToImageSkia();
   }
+  virtual base::string16 GetActionName() const override {
+    return base::ASCIIToUTF16("Component Action");
+  }
   virtual base::string16 GetAccessibleName(content::WebContents* web_contents)
       const override {
-    return base::ASCIIToUTF16("Component Action");
+    return GetActionName();
   }
   virtual base::string16 GetTooltip(content::WebContents* web_contents)
       const override {
-    return GetAccessibleName(web_contents);
+    return GetActionName();
   }
   virtual bool IsEnabled(content::WebContents* web_contents) const override {
     return true;