Update Flaky ToolbarActionViewInteractiveUITests

chrome/browser/ui/views/toolbar/toolbar_action_view.h

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
index 87eec7fbbcaecaeb8f9700238a9900be37fee05c..070433b57eb7dc5d187108f7896526b85fbd9412 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -84,6 +84,8 @@ class ToolbarActionView : public views::MenuButton,
   void OnMenuButtonClicked(views::MenuButton* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
+  // ToolbarActionViewDelegateViews:
+  bool IsMenuRunning() const override;

[Devlin, 2016/08/25 16:42:12]

I'd slightly prefer this wrapped in a ForTesting().

[jonross, 2016/08/25 18:29:27]

Done. I've placed the actual override back in private.

 
   ToolbarActionViewController* view_controller() {
     return view_controller_;
@@ -94,11 +96,6 @@ class ToolbarActionView : public views::MenuButton,
 
   bool wants_to_run_for_testing() const { return wants_to_run_; }
 
-  // Set a callback to be called directly before the context menu is shown.
-  // The toolbar action opening the menu will be passed in.
-  static void set_context_menu_callback_for_testing(
-      ContextMenuCallback* callback);
-
   views::MenuItemView* menu_for_testing() { return menu_; }
 
  private:
@@ -114,7 +111,6 @@ class ToolbarActionView : public views::MenuButton,
   views::View* GetAsView() override;
   views::FocusManager* GetFocusManagerForAccelerator() override;
   views::View* GetReferenceViewForPopup() override;
-  bool IsMenuRunning() const override;
   void OnPopupShown(bool by_user) override;
   void OnPopupClosed() override;