Refactor ExtensionApiTest.WebNavigationEvents* to not rely on window.setTimeout

chrome/browser/extensions/extension_webnavigation_apitest.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_webnavigation_api.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 126 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationFailures) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   FrameNavigationState::set_allow_extension_scheme(true);
 
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_failures.html")) << message_;
 }
 
-// Fails almost consistently on Mac only.  http://crbug.com/94932
-#if defined(OS_MACOSX)
-#define MAYBE_WebNavigationUserAction FAILS_WebNavigationUserAction
-#else
-#define MAYBE_WebNavigationUserAction WebNavigationUserAction
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebNavigationUserAction) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   FrameNavigationState::set_allow_extension_scheme(true);
 
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;
 
   ResultCatcher catcher;
@@ skipping 15 matching lines @@
       ExtensionWebNavigationTabObserver::Get(tab)->
           frame_navigation_state().GetMainFrameID();
   params.link_url = extension->GetResourceURL("userAction/b.html");
 
   TestRenderViewContextMenu menu(tab, params);
   menu.Init();
   menu.ExecuteCommand(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }