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..f0faf3f5755afe42452f04c211f0c1afc64361e9 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -85,6 +85,8 @@ class ToolbarActionView : public views::MenuButton,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
+  bool IsMenuRunningForTesting() const;

[Devlin, 2016/08/25 18:41:44]

nit: put this near the other testing methods.

[jonross, 2016/08/25 20:06:26]

Done.

+
   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: