MacViews: Fix failing Menu Runner Cocoa Tests.

chrome/browser/ui/views/menu_controller_interactive_uitest.cc

 // 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.
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/menu_test_base.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
@@ skipping 75 matching lines @@
 
 #if defined(USE_OZONE)
 // ozone bringup - http://crbug.com/401304
 #define MAYBE_NoMatch DISABLED_NoMatch
 #else
 // If this flakes, disable and log details in http://crbug.com/523255.
 #define MAYBE_NoMatch NoMatch
 #endif
 
 VIEW_TEST(MenuControllerMnemonicTestNoMatch, MAYBE_NoMatch);
+
+class MenuRunnerCancelTest : public MenuTestBase {
+ public:
+  MenuRunnerCancelTest() {}
+
+  // MenuTestBase overrides:
+  void BuildMenu(views::MenuItemView* menu) override {
+    menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/"));
+    menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two"));
+  }
+
+  void DoTestWithMenuOpen() override {
+    ASSERT_EQ(true, menu_runner()->IsRunning());
+    menu_runner()->Cancel();
+    // On calling Cancel, the nested message loop spun by the menu, should be
+    // marked for termination. However, since we are still in the last
+    // iteration of the nested message loop, MenuRunner::IsRunning(), should
+    // return true.
+    ASSERT_EQ(true, menu_runner()->IsRunning());
+    Done();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MenuRunnerCancelTest);
+};
+
+// Test that MenuRunner::IsRunning() returns true, immediately after calling
+// MenuRunner::Cancel() for a syncronous menu.
+VIEW_TEST(MenuRunnerCancelTest, IsRunningAfterCancel);