Commit 9f68c1d4 authored by Henrik Grunell's avatar Henrik Grunell Committed by Commit Bot

Revert "Add EXPECT_TRUE to NavigateToURL usage in webrtc browsertests."

This reverts commit e9859ad0.

Reason for revert: Breaks WebRtcAudioDebugRecordingsBrowserTest on some Mac bots. See bug.

Original change's description:
> Add EXPECT_TRUE to NavigateToURL usage in webrtc browsertests.
> 
> This is in preparation for requiring WARN_UNUSED_RESULT on
> NavigateToURL() usage in tests.
> 
> Bug: 425335
> Change-Id: I23137312bd945c012aee424fc43248516595cfbd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742772
> Auto-Submit: Alex Moshchuk <alexmos@chromium.org>
> Reviewed-by: Tommi <tommi@chromium.org>
> Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#685098}

TBR=tommi@chromium.org,alexmos@chromium.org

Change-Id: I538d5cb813ee7e55cbfee8508b91d2be7b2249f0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 425335, 991935
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1744346Reviewed-by: default avatarHenrik Grunell <grunell@chromium.org>
Commit-Queue: Henrik Grunell <grunell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685180}
parent bc9dde5f
...@@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// We must navigate somewhere first so that the render process is created. // We must navigate somewhere first so that the render process is created.
EXPECT_TRUE(NavigateToURL(shell(), GURL(""))); NavigateToURL(shell(), GURL(""));
// Create a temp directory and setup base file path. // Create a temp directory and setup base file path.
base::FilePath temp_dir_path; base::FilePath temp_dir_path;
...@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
// Make a call. // Make a call.
GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});"); ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});");
ExecuteJavascriptAndWaitForOk("hangup();"); ExecuteJavascriptAndWaitForOk("hangup();");
...@@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// We must navigate somewhere first so that the render process is created. // We must navigate somewhere first so that the render process is created.
EXPECT_TRUE(NavigateToURL(shell(), GURL(""))); NavigateToURL(shell(), GURL(""));
// Create a temp directory and setup base file path. // Create a temp directory and setup base file path.
base::FilePath temp_dir_path; base::FilePath temp_dir_path;
...@@ -220,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -220,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
// Make a call. // Make a call.
GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});"); ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});");
ExecuteJavascriptAndWaitForOk("hangup();"); ExecuteJavascriptAndWaitForOk("hangup();");
...@@ -254,11 +254,11 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -254,11 +254,11 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// We must navigate somewhere first so that the render process is created. // We must navigate somewhere first so that the render process is created.
EXPECT_TRUE(NavigateToURL(shell(), GURL(""))); NavigateToURL(shell(), GURL(""));
// Create a second window. // Create a second window.
Shell* shell2 = CreateBrowser(); Shell* shell2 = CreateBrowser();
EXPECT_TRUE(NavigateToURL(shell2, GURL(""))); NavigateToURL(shell2, GURL(""));
// Create a temp directory and setup base file path. // Create a temp directory and setup base file path.
base::FilePath temp_dir_path; base::FilePath temp_dir_path;
...@@ -272,8 +272,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest, ...@@ -272,8 +272,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcAudioDebugRecordingsBrowserTest,
// Make the calls. // Make the calls.
GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
EXPECT_TRUE(NavigateToURL(shell2, url)); NavigateToURL(shell2, url);
ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});"); ExecuteJavascriptAndWaitForOk("call({video: true, audio: true});");
std::string result; std::string result;
EXPECT_TRUE(ExecuteScriptAndExtractString( EXPECT_TRUE(ExecuteScriptAndExtractString(
......
...@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcConstraintsBrowserTest, ...@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcConstraintsBrowserTest,
user_media().min_frame_rate, user_media().min_frame_rate,
user_media().max_frame_rate); user_media().max_frame_rate);
DVLOG(1) << "Calling getUserMedia: " << call; DVLOG(1) << "Calling getUserMedia: " << call;
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk(call); ExecuteJavascriptAndWaitForOk(call);
} }
......
...@@ -84,7 +84,7 @@ void WebRtcContentBrowserTestBase::MakeTypicalCall( ...@@ -84,7 +84,7 @@ void WebRtcContentBrowserTestBase::MakeTypicalCall(
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL(html_file)); GURL url(embedded_test_server()->GetURL(html_file));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk(javascript); ExecuteJavascriptAndWaitForOk(javascript);
} }
......
...@@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcTwoDeviceDepthCaptureBrowserTest, ...@@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcTwoDeviceDepthCaptureBrowserTest,
GURL url( GURL url(
embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html")); embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk(base::StringPrintf( ExecuteJavascriptAndWaitForOk(base::StringPrintf(
"%s({video: true});", kGetDepthStreamAndCallCreateImageBitmap)); "%s({video: true});", kGetDepthStreamAndCallCreateImageBitmap));
...@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcTwoDeviceDepthCaptureVideoKindBrowserTest, ...@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcTwoDeviceDepthCaptureVideoKindBrowserTest,
GURL url( GURL url(
embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html")); embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk( ExecuteJavascriptAndWaitForOk(
base::StringPrintf("%s({video: true});", kGetStreamsByVideoKind)); base::StringPrintf("%s({video: true});", kGetStreamsByVideoKind));
...@@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcOneDeviceDepthCaptureVideoKindBrowserTest, ...@@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcOneDeviceDepthCaptureVideoKindBrowserTest,
GURL url( GURL url(
embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html")); embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk( ExecuteJavascriptAndWaitForOk(
base::StringPrintf("%s({video: true});", kGetStreamsByVideoKindNoDepth)); base::StringPrintf("%s({video: true});", kGetStreamsByVideoKindNoDepth));
......
...@@ -118,7 +118,7 @@ class WebRtcImageCaptureBrowserTestBase ...@@ -118,7 +118,7 @@ class WebRtcImageCaptureBrowserTestBase
#endif #endif
GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile)); GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
if (!IsWebcamAvailableOnSystem(shell()->web_contents())) { if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
DVLOG(1) << "No video device; skipping test..."; DVLOG(1) << "No video device; skipping test...";
......
...@@ -503,7 +503,7 @@ class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest { ...@@ -503,7 +503,7 @@ class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest {
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
AddAndRemovePeerConnection) { AddAndRemovePeerConnection) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
// Add two PeerConnections and then remove them. // Add two PeerConnections and then remove them.
PeerConnectionEntry pc_1(1, 0); PeerConnectionEntry pc_1(1, 0);
...@@ -525,7 +525,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ...@@ -525,7 +525,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
UpdateAllPeerConnections) { UpdateAllPeerConnections) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc_0(1, 0); PeerConnectionEntry pc_0(1, 0);
pc_0.AddEvent("e1", "v1"); pc_0.AddEvent("e1", "v1");
...@@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ...@@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdatePeerConnection) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdatePeerConnection) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
// Add one PeerConnection and send one update. // Add one PeerConnection and send one update.
PeerConnectionEntry pc_1(1, 0); PeerConnectionEntry pc_1(1, 0);
...@@ -579,7 +579,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdatePeerConnection) { ...@@ -579,7 +579,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdatePeerConnection) {
// Tests that adding random named stats updates the dataSeries and graphs. // Tests that adding random named stats updates the dataSeries and graphs.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, AddStats) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, AddStats) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc(1, 0); PeerConnectionEntry pc(1, 0);
ExecuteAddPeerConnectionJs(pc); ExecuteAddPeerConnectionJs(pc);
...@@ -605,7 +605,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, AddStats) { ...@@ -605,7 +605,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, AddStats) {
// Tests that the bandwidth estimation values are drawn on a single graph. // Tests that the bandwidth estimation values are drawn on a single graph.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, BweCompoundGraph) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, BweCompoundGraph) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc(1, 0); PeerConnectionEntry pc(1, 0);
ExecuteAddPeerConnectionJs(pc); ExecuteAddPeerConnectionJs(pc);
...@@ -645,7 +645,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, BweCompoundGraph) { ...@@ -645,7 +645,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, BweCompoundGraph) {
// and the converted data is drawn. // and the converted data is drawn.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ConvertedGraphs) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ConvertedGraphs) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc(1, 0); PeerConnectionEntry pc(1, 0);
ExecuteAddPeerConnectionJs(pc); ExecuteAddPeerConnectionJs(pc);
...@@ -690,14 +690,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ...@@ -690,14 +690,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
// Start a peerconnection call in the first window. // Start a peerconnection call in the first window.
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
ASSERT_TRUE(ExecuteJavascript("call({video:true});")); ASSERT_TRUE(ExecuteJavascript("call({video:true});"));
ExpectTitle("OK"); ExpectTitle("OK");
// Open webrtc-internals in the second window. // Open webrtc-internals in the second window.
GURL url2("chrome://webrtc-internals"); GURL url2("chrome://webrtc-internals");
Shell* shell2 = CreateBrowser(); Shell* shell2 = CreateBrowser();
EXPECT_TRUE(NavigateToURL(shell2, url2)); NavigateToURL(shell2, url2);
const int NUMBER_OF_PEER_CONNECTIONS = 2; const int NUMBER_OF_PEER_CONNECTIONS = 2;
...@@ -770,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ...@@ -770,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc_0(1, 0); PeerConnectionEntry pc_0(1, 0);
pc_0.AddEvent("e1", "v1"); pc_0.AddEvent("e1", "v1");
...@@ -815,7 +815,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) { ...@@ -815,7 +815,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) {
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdateGetUserMedia) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdateGetUserMedia) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
UserMediaRequestEntry request1(1, 1, "origin", "ac", "vc"); UserMediaRequestEntry request1(1, 1, "origin", "ac", "vc");
UserMediaRequestEntry request2(2, 2, "origin2", "ac2", "vc2"); UserMediaRequestEntry request2(2, 2, "origin2", "ac2", "vc2");
...@@ -841,7 +841,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdateGetUserMedia) { ...@@ -841,7 +841,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdateGetUserMedia) {
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
ReceivedPropagationDelta) { ReceivedPropagationDelta) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
PeerConnectionEntry pc(1, 0); PeerConnectionEntry pc(1, 0);
ExecuteAddPeerConnectionJs(pc); ExecuteAddPeerConnectionJs(pc);
......
...@@ -73,7 +73,7 @@ class WebRtcImageCaptureStressBrowserTest ...@@ -73,7 +73,7 @@ class WebRtcImageCaptureStressBrowserTest
// skipped or it works as intended, or false otherwise. // skipped or it works as intended, or false otherwise.
virtual bool RunImageCaptureTestCase(const std::string& command) { virtual bool RunImageCaptureTestCase(const std::string& command) {
GURL url(embedded_test_server()->GetURL(kImageCaptureStressHtmlFile)); GURL url(embedded_test_server()->GetURL(kImageCaptureStressHtmlFile));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
if (!IsWebcamAvailableOnSystem(shell()->web_contents())) { if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
LOG(WARNING) << "No video device; skipping test..."; LOG(WARNING) << "No video device; skipping test...";
......
...@@ -69,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcVideoCaptureBrowserTest, ...@@ -69,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcVideoCaptureBrowserTest,
return; return;
GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile)); GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
std::string result; std::string result;
// Start video capture and wait until it started rendering // Start video capture and wait until it started rendering
......
...@@ -471,7 +471,7 @@ class WebRtcVideoCaptureServiceBrowserTest : public ContentBrowserTest { ...@@ -471,7 +471,7 @@ class WebRtcVideoCaptureServiceBrowserTest : public ContentBrowserTest {
DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile)); GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
std::string javascript_to_execute = base::StringPrintf( std::string javascript_to_execute = base::StringPrintf(
kStartVideoCaptureAndVerify, video_size_.width(), video_size_.height()); kStartVideoCaptureAndVerify, video_size_.width(), video_size_.height());
......
...@@ -212,8 +212,8 @@ class WebRtcVideoCaptureServiceEnumerationBrowserTest ...@@ -212,8 +212,8 @@ class WebRtcVideoCaptureServiceEnumerationBrowserTest
ASSERT_TRUE(embedded_test_server()->InitializeAndListen()); ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
EXPECT_TRUE(NavigateToURL( NavigateToURL(shell(),
shell(), GURL(embedded_test_server()->GetURL(kVideoCaptureHtmlFile)))); GURL(embedded_test_server()->GetURL(kVideoCaptureHtmlFile)));
} }
std::map<std::string, video_capture::mojom::TextureVirtualDevicePtr> std::map<std::string, video_capture::mojom::TextureVirtualDevicePtr>
......
...@@ -99,7 +99,7 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest ...@@ -99,7 +99,7 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest
DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile)); GURL url(embedded_test_server()->GetURL(kVideoCaptureHtmlFile));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
const std::string javascript_to_execute = base::StringPrintf( const std::string javascript_to_execute = base::StringPrintf(
kStartVideoCaptureAndVerify, kVideoSize.width(), kVideoSize.height()); kStartVideoCaptureAndVerify, kVideoSize.width(), kVideoSize.height());
......
...@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(UsingRealWebcam_WebRtcWebcamBrowserTest, ...@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(UsingRealWebcam_WebRtcWebcamBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL( GURL url(embedded_test_server()->GetURL(
"/media/getusermedia-real-webcam.html")); "/media/getusermedia-real-webcam.html"));
EXPECT_TRUE(NavigateToURL(shell(), url)); NavigateToURL(shell(), url);
if (!IsWebcamAvailableOnSystem(shell()->web_contents())) { if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
DVLOG(0) << "No video device; skipping test..."; DVLOG(0) << "No video device; skipping test...";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment