Update Flaky ToolbarActionViewInteractiveUITests

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

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 25 matching lines @@
 
 using views::LabelButtonBorder;
 
 namespace {
 
 // Toolbar action buttons have no insets because the badges are drawn right at
 // the edge of the view's area. Other badding (such as centering the icon) is
 // handled directly by the Image.
 const int kBorderInset = 0;
 
-// The callback to call directly before showing the context menu.
-ToolbarActionView::ContextMenuCallback* context_menu_callback_for_test =
-    nullptr;
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarActionView
 
 ToolbarActionView::ToolbarActionView(
     ToolbarActionViewController* view_controller,
     ToolbarActionView::Delegate* delegate)
     : MenuButton(base::string16(), this, false),
       view_controller_(view_controller),
@@ skipping 100 matching lines @@
     // We should only get a button pressed event with a non-enabled action if
     // the left-click behavior should open the menu.
     DCHECK(view_controller_->DisabledClickOpensMenu());
     context_menu_controller()->ShowContextMenuForView(this, point,
                                                       ui::MENU_SOURCE_NONE);
   } else {
     view_controller_->ExecuteAction(true);
   }
 }
 
+bool ToolbarActionView::IsMenuRunningForTesting() const {
+  return IsMenuRunning();
+}
+
 void ToolbarActionView::OnMenuClosed() {
   menu_runner_.reset();
   menu_ = nullptr;
   view_controller_->OnContextMenuClosed();
   menu_adapter_.reset();
 }
 
 gfx::ImageSkia ToolbarActionView::GetIconForTest() {
   return GetImage(views::Button::STATE_NORMAL);
 }
 
-void ToolbarActionView::set_context_menu_callback_for_testing(
-    base::Callback<void(ToolbarActionView*)>* callback) {
-  context_menu_callback_for_test = callback;
-}
-
 gfx::Size ToolbarActionView::GetPreferredSize() const {
   return gfx::Size(ToolbarActionsBar::IconWidth(false),
                    ToolbarActionsBar::IconHeight());
 }
 
 bool ToolbarActionView::OnMousePressed(const ui::MouseEvent& event) {
   // views::MenuButton actions are only triggered by left mouse clicks.
   if (event.IsOnlyLeftMouseButton() && !pressed_lock_) {
     // TODO(bruthig): The ACTION_PENDING triggering logic should be in
     // MenuButton::OnPressed() however there is a bug with the pressed state
@@ skipping 99 matching lines @@
 
   // Unretained() is safe here as ToolbarActionView will always outlive the
   // menu. Any action that would lead to the deletion of |this| first triggers
   // the closing of the menu through lost capture.
   menu_adapter_.reset(new views::MenuModelAdapter(
       context_menu_model,
       base::Bind(&ToolbarActionView::OnMenuClosed, base::Unretained(this))));
   menu_ = menu_adapter_->CreateMenu();
   menu_runner_.reset(new views::MenuRunner(menu_, run_types));
 
-  if (context_menu_callback_for_test)
-    context_menu_callback_for_test->Run(this);
   ignore_result(
       menu_runner_->RunMenuAt(parent, this, gfx::Rect(screen_loc, size()),
                               views::MENU_ANCHOR_TOPLEFT, source_type));
 }
 
 bool ToolbarActionView::CloseActiveMenuIfNeeded() {
   // If this view is shown inside another menu, there's a possibility that there
   // is another context menu showing that we have to close before we can
   // activate a different menu.
   if (delegate_->ShownInsideMenu()) {
     views::MenuController* menu_controller =
         views::MenuController::GetActiveInstance();
     // If this is shown inside a menu, then there should always be an active
     // menu controller.
     DCHECK(menu_controller);
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }