Make WebRtcWebcamBrowserTest fail faster.

chrome/browser/media/webrtc_browsertest_base.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/media/webrtc_browsertest_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 82 matching lines @@
 }
 
 WebRtcTestBase::~WebRtcTestBase() {
   if (detect_errors_in_javascript_) {
     EXPECT_FALSE(hit_javascript_errors_.Get())
         << "Encountered javascript errors during test execution (Search "
         << "for Uncaught or ERROR:CONSOLE in the test output).";
   }
 }
 
-void WebRtcTestBase::GetUserMediaAndAccept(
+bool WebRtcTestBase::GetUserMediaAndAccept(
     content::WebContents* tab_contents) const {
-  GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
-                                               kAudioVideoCallConstraints);
+  return GetUserMediaWithSpecificConstraintsAndAccept(
+      tab_contents, kAudioVideoCallConstraints);
 }
 
-void WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndAccept(
+bool WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndAccept(
     content::WebContents* tab_contents,
     const std::string& constraints) const {
   infobars::InfoBar* infobar =
       GetUserMediaAndWaitForInfoBar(tab_contents, constraints);
   infobar->delegate()->AsConfirmInfoBarDelegate()->Accept();
   CloseInfoBarInTab(tab_contents, infobar);
 
   // Wait for WebRTC to call the success callback.
   const char kOkGotStream[] = "ok-got-stream";
-  EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()", kOkGotStream,
-                                     tab_contents));
+  return test::PollingWaitUntil("obtainGetUserMediaResult()", kOkGotStream,
+                                tab_contents);
 }
 
 void WebRtcTestBase::GetUserMediaAndDeny(content::WebContents* tab_contents) {
   return GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
                                                     kAudioVideoCallConstraints);
 }
 
 void WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndDeny(
     content::WebContents* tab_contents,
     const std::string& constraints) const {
@@ skipping 55 matching lines @@
 }
 
 content::WebContents*
 WebRtcTestBase::OpenPageAndGetUserMediaInNewTabWithConstraints(
     const GURL& url,
     const std::string& constraints) const {
   chrome::AddTabAt(browser(), GURL(), -1, true);
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* new_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  GetUserMediaWithSpecificConstraintsAndAccept(new_tab, constraints);
+  EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
+      new_tab, constraints));
   return new_tab;
 }
 
 content::WebContents* WebRtcTestBase::OpenTestPageAndGetUserMediaInNewTab(
     const std::string& test_page) const {
   return OpenPageAndGetUserMediaInNewTab(
       embedded_test_server()->GetURL(test_page));
 }
 
 content::WebContents* WebRtcTestBase::OpenPageAndAcceptUserMedia(
@@ skipping 123 matching lines @@
 }
 
 void WebRtcTestBase::StartDetectingVideo(
     content::WebContents* tab_contents,
     const std::string& video_element) const {
   std::string javascript = base::StringPrintf(
       "startDetection('%s', 320, 240)", video_element.c_str());
   EXPECT_EQ("ok-started", ExecuteJavascript(javascript, tab_contents));
 }
 
-void WebRtcTestBase::WaitForVideoToPlay(
+bool WebRtcTestBase::WaitForVideoToPlay(
     content::WebContents* tab_contents) const {
-  EXPECT_TRUE(test::PollingWaitUntil("isVideoPlaying()", "video-playing",
-                                     tab_contents));
+  bool is_video_playing = test::PollingWaitUntil(
+      "isVideoPlaying()", "video-playing", tab_contents);
+  EXPECT_TRUE(is_video_playing);
+  return is_video_playing;
 }
 
 std::string WebRtcTestBase::GetStreamSize(
     content::WebContents* tab_contents,
     const std::string& video_element) const {
   std::string javascript =
       base::StringPrintf("getStreamSize('%s')", video_element.c_str());
   std::string result = ExecuteJavascript(javascript, tab_contents);
   EXPECT_TRUE(StartsWithASCII(result, "ok-", true));
   return result.substr(3);
@@ skipping 14 matching lines @@
 #endif
 }
 
 bool WebRtcTestBase::OnWin8() const {
 #if defined(OS_WIN)
   return base::win::GetVersion() > base::win::VERSION_WIN7;
 #else
   return false;
 #endif
 }