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

chrome/browser/ui/toolbar/toolbar_actions_bar.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 178 matching lines @@
 
   // Pops out a given |action|, ensuring it is visible.
   // |is_sticky| refers to whether or not the action will stay popped out if
   // the overflow menu is opened.
   // |closure| will be called once any animation is complete.
   void PopOutAction(ToolbarActionViewController* action,
                     bool is_sticky,
                     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);
 
   // Hides the actively showing popup, if any.
   void HideActivePopup();
 
   // Returns the main (i.e., not overflow) controller for the given action.
   ToolbarActionViewController* GetMainControllerForAction(
       ToolbarActionViewController* action);
@@ skipping 22 matching lines @@
   }
   bool is_highlighting() const { return model_ && model_->is_highlighting(); }
   ToolbarActionsModel::HighlightType highlight_type() const {
     return model_ ? model_->highlight_type()
                   : ToolbarActionsModel::HIGHLIGHT_NONE;
   }
   const PlatformSettings& platform_settings() const {
     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_; }
 
   ToolbarActionsBarDelegate* delegate_for_test() { return delegate_; }
 
   // During testing we can disable animations by setting this flag to true,
   // so that the bar resizes instantly, instead of having to poll it while it
   // animates to open/closed status.
   static bool disable_animations_for_testing_;
   static void set_extension_bubble_appearance_wait_time_for_testing(
@@ skipping 105 matching lines @@
   ScopedObserver<TabStripModel, TabStripModelObserver> tab_strip_observer_;
 
   base::ObserverList<ToolbarActionsBarObserver> observers_;
 
   base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_