Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 13679005: Remove MSID and bundle from the answer as well as offer in WebRtc content_browsertest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reenabled the test CallWithDataAndLaterAddMedia. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "content/browser/web_contents/web_contents_impl.h" 7 #include "content/browser/web_contents/web_contents_impl.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 #include "content/shell/shell.h" 10 #include "content/shell/shell.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { 130 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) {
131 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); 131 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
132 NavigateToURL(shell(), url); 132 NavigateToURL(shell(), url);
133 133
134 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); 134 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();"));
135 ExpectTitle("OK"); 135 ExpectTitle("OK");
136 } 136 }
137 137
138 // This test will make a PeerConnection-based call and test an unreliable text 138 // This test will make a PeerConnection-based call and test an unreliable text
139 // dataChannel and later add an audio and video track. 139 // dataChannel and later add an audio and video track.
140 // Flaky. http://crbug.com/175683 140 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndLaterAddMedia) {
141 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
142 DISABLED_CallWithDataAndLaterAddMedia) {
143 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); 141 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
144 NavigateToURL(shell(), url); 142 NavigateToURL(shell(), url);
145 143
146 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); 144 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();"));
147 ExpectTitle("OK"); 145 ExpectTitle("OK");
148 } 146 }
149 147
150 } // namespace content 148 } // namespace content
151 149
OLDNEW
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698