Show media router toolbar icon ephemerally for active local routes and issues

chrome/browser/ui/toolbar/media_router_contextual_menu.h

Index: chrome/browser/ui/toolbar/media_router_contextual_menu.h
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.h b/chrome/browser/ui/toolbar/media_router_contextual_menu.h
index 1fdb949c495505b575e648dd3f8501d494bc1348..1be70032b223b4d8ab70e03f57e6834a9dff0b1e 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu.h
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.h
@@ -10,6 +10,7 @@
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
+class ToolbarActionsModel;
 
 // The class for the contextual menu for the Media Router action.
 class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate {
@@ -24,6 +25,16 @@ class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate {
   FRIEND_TEST_ALL_PREFIXES(MediaRouterContextualMenuUnitTest,
                            ToggleCloudServicesItem);
 #endif  // GOOGLE_CHROME_BUILD
+  FRIEND_TEST_ALL_PREFIXES(MediaRouterContextualMenuUnitTest,
+                           ToggleAlwaysShowIconItem);
+
+  // For injecting dependency in tests.
+  MediaRouterContextualMenu(Browser* browser,
+                            ToolbarActionsModel* toolbar_actions_model);
+
+  // Gets or sets the "Always show icon" option.
+  bool GetAlwaysShowActionPref() const;
+  void SetAlwaysShowActionPref(bool always_show);
 
   // ui::SimpleMenuModel::Delegate:
   bool IsCommandIdChecked(int command_id) const override;
@@ -32,10 +43,10 @@ class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate {
   void ExecuteCommand(int command_id, int event_flags) override;
 
   void ReportIssue();
-  void RemoveMediaRouterComponentAction();
 
-  Browser* browser_;
+  Browser* const browser_;
   ui::SimpleMenuModel menu_model_;
+  ToolbarActionsModel* const toolbar_actions_model_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterContextualMenu);
 };