Fix WebViewTest.MediaAccessAPIAllow* flakiness/timeout on chromeos.

chrome/browser/extensions/web_view_browsertest.cc

 // Copyright (c) 2012 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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/prerender/prerender_link_manager.h"
@@ skipping 386 matching lines @@
     EXPECT_TRUE(source->GetWebContents()->GetRenderProcessHost()->IsGuest());
 
     bool satisfied = guest_loaded_listener.WaitUntilSatisfied();
     if (!satisfied)
       return NULL;
 
     content::WebContents* guest_web_contents = source->GetWebContents();
     return guest_web_contents;
   }
 
+  void MediaAccessAPIAllowTestHelper(const std::string& test_name);
+
  private:
   scoped_ptr<content::FakeSpeechRecognitionManager>
       fake_speech_recognition_manager_;
 };
 
 // This test is flaky on Windows, Chrome OS, and Mac (all platforms that
 // have threaded compositing enabled).
 // http://crbug.com/176122
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
 #define MAYBE_Shim DISABLED_Shim
@@ skipping 421 matching lines @@
   ASSERT_TRUE(done_test_listener.WaitUntilSatisfied());
 }
 
 // Disabled for being flaky: http://crbug.com/237985
 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_MediaAccessAPIDeny) {
   ASSERT_TRUE(StartTestServer());  // For serving guest pages.
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/web_view/media_access/deny")) << message_;
 }
 
-// Disabled for being flaky: http://crbug.com/238662
-#if defined(OS_CHROMEOS)
-#define MAYBE_MediaAccessAPIAllow DISABLED_MediaAccessAPIAllow
-#else
-#define MAYBE_MediaAccessAPIAllow MediaAccessAPIAllow
-#endif
-IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_MediaAccessAPIAllow) {
+void WebViewTest::MediaAccessAPIAllowTestHelper(const std::string& test_name) {
   ASSERT_TRUE(StartTestServer());  // For serving guest pages.
   ExtensionTestMessageListener launched_listener("Launched", false);
   LoadAndLaunchPlatformApp("web_view/media_access/allow");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
   content::WebContents* embedder_web_contents =
       GetFirstShellWindowWebContents();
   ASSERT_TRUE(embedder_web_contents);
   MockWebContentsDelegate* mock = new MockWebContentsDelegate;
   embedder_web_contents->SetDelegate(mock);
 
-  const size_t num_tests = 4;
-  std::string test_names[num_tests] = {
-    "testAllow",
-    "testAllowAndThenDeny",
-    "testAllowTwice",
-    "testAllowAsync",
-  };
-  for (size_t i = 0; i < num_tests; ++i) {
-    ExtensionTestMessageListener done_listener("DoneMediaTest", false);
-    EXPECT_TRUE(
-        content::ExecuteScript(
-            embedder_web_contents,
-            base::StringPrintf("startAllowTest('%s')",
-                               test_names[i].c_str())));
-    done_listener.WaitUntilSatisfied();
+  ExtensionTestMessageListener done_listener("DoneMediaTest.PASSED", false);
+  done_listener.AlsoListenForFailureMessage("DoneMediaTest.FAILED");
+  EXPECT_TRUE(
+      content::ExecuteScript(
+          embedder_web_contents,
+          base::StringPrintf("startAllowTest('%s')",
+                             test_name.c_str())));
+  ASSERT_TRUE(done_listener.WaitUntilSatisfied());
 
-    std::string result;
-    EXPECT_TRUE(
-        content::ExecuteScriptAndExtractString(
-            embedder_web_contents,
-            "window.domAutomationController.send(getTestStatus())", &result));
-    ASSERT_EQ(std::string("PASSED"), result);
+  mock->WaitForSetMediaPermission();
+}
 
-    mock->WaitForSetMediaPermission();
-  }
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIAllow_TestAllow) {
+  MediaAccessAPIAllowTestHelper("testAllow");
+}
+
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIAllow_TestAllowAndThenDeny) {
+  MediaAccessAPIAllowTestHelper("testAllowAndThenDeny");
+}
+
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIAllow_TestAllowTwice) {
+  MediaAccessAPIAllowTestHelper("testAllowTwice");
+}
+
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIAllow_TestAllowAsync) {
+  MediaAccessAPIAllowTestHelper("testAllowAsync");
 }
 
 // Checks that window.screenX/screenY/screenLeft/screenTop works correctly for
 // guests.
 IN_PROC_BROWSER_TEST_F(WebViewTest, ScreenCoordinates) {
   ASSERT_TRUE(StartTestServer());  // For serving guest pages.
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/screen_coordinates"))
       << message_;
 }
 
@@ skipping 114 matching lines @@
   EXPECT_TRUE(content::ExecuteScript(guest_web_contents,
                                      "startDownload('download-link-2')"));
   mock_delegate->WaitForCanDownload(true); // Expect to allow.
   mock_delegate->Reset();
 
   // 3. Guest requests a download that its embedder ignores, this implies deny.
   EXPECT_TRUE(content::ExecuteScript(guest_web_contents,
                                      "startDownload('download-link-3')"));
   mock_delegate->WaitForCanDownload(false); // Expect to not allow.
 }