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 c46a216b8006b0c62f06120da863f39df303b154..5778d527e1dd6e0931c5f5aa686c033a1d0dcb77 100644
--- a/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
@@ -36,12 +36,16 @@ class MockComponentAction : public ToolbarActionViewController {
   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;