Fix WebViewTest.MediaAccessAPIAllow* flakiness/timeout on chromeos.

Split the individual tests, this was timing out occasionally otherwise on linux_chromeos build bots.

BUG=238662
TEST=WebViewTest.MediaAccessAPIAllow, verified timeout is fixed by running each tests 200 times on trybots, tests now do not flake.

Review URL: https://chromiumcodereview.appspot.com/15741014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202031 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/web_view_browsertest.cc

@@ -404,6 +404,8 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
     return guest_web_contents;
   }
 
+  void MediaAccessAPIAllowTestHelper(const std::string& test_name);
+
  private:
   scoped_ptr<content::FakeSpeechRecognitionManager>
       fake_speech_recognition_manager_;
@@ -845,13 +847,7 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_MediaAccessAPIDeny) {
       "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");
@@ -863,31 +859,32 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_MediaAccessAPIAllow) {
   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

chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js

@@ -7,29 +7,18 @@ embedder.tests = {};
 embedder.baseGuestURL = '';
 embedder.guestURL = '';
 
-embedder.testStatus = '';
-
 // Sends a message to WebViewTest denoting it is done and test
 // has failed.
 embedder.failTest = function(msg) {
-  embedder.testStatus = 'FAILED';
-  chrome.test.log('test failure, reason: ' + msg);
-  chrome.test.sendMessage('DoneMediaTest');
+  window.console.log('test failure, reason: ' + msg);
+  chrome.test.sendMessage('DoneMediaTest.FAILED');
 };
 
 // Sends a message to WebViewTest denoting it is done and test
-// has succeeded, iff the test has not already failed.
+// has succeeded.
 embedder.maybePassTest = function() {
-  if (embedder.testStatus != 'FAILED') {
-    embedder.testStatus = 'PASSED';
-  }
-  chrome.test.sendMessage('DoneMediaTest');
-};
-
-// Called by browser_tests to query test state.
-function getTestStatus() {
-  chrome.test.log('getTestStatus called: status = ' + embedder.testStatus);
-  return embedder.testStatus;
+  window.console.log('test passed');
+  chrome.test.sendMessage('DoneMediaTest.PASSED');
 };
 
 /** @private */
@@ -235,7 +224,6 @@ function startAllowTest(testName) {
       embedder.failTest('No such test: ' + testName);
       return;
     }
-    embedder.testStatus = '';
     testFunction();
   });
 }