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

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

Issue 39033006: Add tests for legacy SDP features. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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
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/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle) { 226 MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
227 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 227 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
228 228
229 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 229 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
230 NavigateToURL(shell(), url); 230 NavigateToURL(shell(), url);
231 231
232 EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();")); 232 EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();"));
233 ExpectTitle("OK"); 233 ExpectTitle("OK");
234 } 234 }
235 235
236 // This test will make a complete PeerConnection-based call using legacy SDP
237 // settings: GIce, external SDES, and no BUNDLE.
238 #if defined(OS_WIN) && defined(USE_AURA)
239 // Disabled for win7_aura, see http://crbug.com/235089.
240 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall
241 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
242 // Timing out on ARM linux, see http://crbug.com/240373
243 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall
244 #else
245 #define MAYBE_CanSetupLegacyCall CanSetupLegacyCall
246 #endif
phoglund_chromium 2013/10/25 00:45:05 Nit: insert blank line here.
bemasc 2013/10/25 17:39:55 Done.
247 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupLegacyCall) {
248 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
249
250 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
251 NavigateToURL(shell(), url);
252
253 EXPECT_TRUE(ExecuteJavascript("callWithLegacySdp();"));
254 ExpectTitle("OK");
255 }
256
236 // This test will make a PeerConnection-based call and test an unreliable text 257 // This test will make a PeerConnection-based call and test an unreliable text
237 // dataChannel. 258 // dataChannel.
238 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. 259 // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
239 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) { 260 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
240 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 261 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
241 262
242 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 263 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
243 NavigateToURL(shell(), url); 264 NavigateToURL(shell(), url);
244 265
245 EXPECT_TRUE(ExecuteJavascript("callWithDataOnly();")); 266 EXPECT_TRUE(ExecuteJavascript("callWithDataOnly();"));
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 433
413 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 434 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
414 NavigateToURL(shell(), url); 435 NavigateToURL(shell(), url);
415 436
416 EXPECT_TRUE( 437 EXPECT_TRUE(
417 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); 438 ExecuteJavascript("addTwoMediaStreamsToOneConnection();"));
418 ExpectTitle("OK"); 439 ExpectTitle("OK");
419 } 440 }
420 441
421 } // namespace content 442 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | content/test/data/media/peerconnection-call.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698