OLD | NEW |
---|---|
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/debug/trace_event_impl.h" | 6 #include "base/debug/trace_event_impl.h" |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
353 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateNonCryptoCall) { | 353 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateNonCryptoCall) { |
354 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 354 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
355 | 355 |
356 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 356 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
357 NavigateToURL(shell(), url); | 357 NavigateToURL(shell(), url); |
358 | 358 |
359 EXPECT_TRUE(ExecuteJavascript("negotiateNonCryptoCall();")); | 359 EXPECT_TRUE(ExecuteJavascript("negotiateNonCryptoCall();")); |
360 ExpectTitle("OK"); | 360 ExpectTitle("OK"); |
361 } | 361 } |
362 | 362 |
363 // This test can negotiate an SDP offer that includes a b=AS:xx to control | |
364 // the bandwidth for audio and video | |
365 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, NegotiateOfferWithBLine) { | |
366 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | |
367 | |
368 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | |
369 NavigateToURL(shell(), url); | |
370 | |
371 EXPECT_TRUE(ExecuteJavascript("negotiateOfferWithBLine();")); | |
wjia(left Chromium)
2013/12/12 22:04:35
It seems this test enables both audio and video. O
| |
372 ExpectTitle("OK"); | |
373 } | |
374 | |
363 // This test will make a complete PeerConnection-based call using legacy SDP | 375 // This test will make a complete PeerConnection-based call using legacy SDP |
364 // settings: GIce, external SDES, and no BUNDLE. | 376 // settings: GIce, external SDES, and no BUNDLE. |
365 #if defined(OS_WIN) && defined(USE_AURA) | 377 #if defined(OS_WIN) && defined(USE_AURA) |
366 // Disabled for win7_aura, see http://crbug.com/235089. | 378 // Disabled for win7_aura, see http://crbug.com/235089. |
367 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall | 379 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall |
368 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 380 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
369 // Timing out on ARM linux, see http://crbug.com/240373 | 381 // Timing out on ARM linux, see http://crbug.com/240373 |
370 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall | 382 #define MAYBE_CanSetupLegacyCall DISABLED_CanSetupLegacyCall |
371 #else | 383 #else |
372 #define MAYBE_CanSetupLegacyCall CanSetupLegacyCall | 384 #define MAYBE_CanSetupLegacyCall CanSetupLegacyCall |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
612 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 624 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
613 NavigateToURL(shell(), url); | 625 NavigateToURL(shell(), url); |
614 | 626 |
615 EXPECT_TRUE(ExecuteJavascript( | 627 EXPECT_TRUE(ExecuteJavascript( |
616 base::StringPrintf("callAndEnsureAudioMutingWorks(%s);", | 628 base::StringPrintf("callAndEnsureAudioMutingWorks(%s);", |
617 kForceIsac16K))); | 629 kForceIsac16K))); |
618 ExpectTitle("OK"); | 630 ExpectTitle("OK"); |
619 } | 631 } |
620 | 632 |
621 } // namespace content | 633 } // namespace content |
OLD | NEW |