[Media Router Action] Hide action back in the overflow menu after popping it out

chrome/browser/ui/toolbar/toolbar_actions_bar.h

Index: chrome/browser/ui/toolbar/toolbar_actions_bar.h
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.h b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
index 9e0a6a6f76830bbef08ac0ba1918f01f1eb36e04..76983d58b0c80788b670114d310178b70ad821b0 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
@@ -196,8 +196,8 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer,
                     const base::Closure& closure);
 
   // Undoes the current "pop out"; i.e., moves the popped out action back into
-  // overflow.
-  void UndoPopOut();
+  // overflow. Marked virtual for tests.
+  virtual void UndoPopOut();

[Devlin, 2016/12/15 22:25:26]

I'd like to avoid this if possible; see also comment in the unittest.

 
   // Sets the active popup owner to be |popup_owner|.
   void SetPopupOwner(ToolbarActionViewController* popup_owner);
@@ -240,9 +240,8 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer,
     return platform_settings_;
   }
   ToolbarActionViewController* popup_owner() { return popup_owner_; }
-  ToolbarActionViewController* popped_out_action() {
-    return popped_out_action_;
-  }
+  // Marked virtual for tests.
+  virtual ToolbarActionViewController* popped_out_action();
   bool in_overflow_mode() const { return main_bar_ != nullptr; }
   bool is_showing_bubble() const { return is_showing_bubble_; }