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/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 30 matching lines...) Expand all Loading... | |
41 min_frame_rate, | 41 min_frame_rate, |
42 max_frame_rate); | 42 max_frame_rate); |
43 } | 43 } |
44 } | 44 } |
45 | 45 |
46 namespace content { | 46 namespace content { |
47 | 47 |
48 #if defined(OS_LINUX) | 48 #if defined(OS_LINUX) |
49 // All tests are flaky on Linux: crbug.com/281492. | 49 // All tests are flaky on Linux: crbug.com/281492. |
50 #define MAYBE_WebrtcBrowserTest DISABLED_WebrtcBrowserTest | 50 #define MAYBE_WebrtcBrowserTest DISABLED_WebrtcBrowserTest |
51 | |
52 // Workaround for crbug.com/285051. This can safely be removed if any of the | |
53 // cases selected by --gtest_filter=WebRTC*:Webrtc*:*Dtmf get re-enabled. | |
54 class WebrtcWorkaroundBugWithEmptyFilter: public ContentBrowserTest {}; | |
tommi (sloooow) - chröme
2013/09/04 10:26:30
space before :
| |
55 IN_PROC_BROWSER_TEST_F(WebrtcWorkaroundBugWithEmptyFilter, Succeeds) { | |
56 ASSERT_TRUE(true); | |
57 } | |
51 #else | 58 #else |
52 #define MAYBE_WebrtcBrowserTest WebrtcBrowserTest | 59 #define MAYBE_WebrtcBrowserTest WebrtcBrowserTest |
53 #endif | 60 #endif |
54 | 61 |
55 class MAYBE_WebrtcBrowserTest: public ContentBrowserTest { | 62 class MAYBE_WebrtcBrowserTest: public ContentBrowserTest { |
56 public: | 63 public: |
57 MAYBE_WebrtcBrowserTest() {} | 64 MAYBE_WebrtcBrowserTest() {} |
58 virtual ~MAYBE_WebrtcBrowserTest() {} | 65 virtual ~MAYBE_WebrtcBrowserTest() {} |
59 | 66 |
60 virtual void SetUpOnMainThread() OVERRIDE { | 67 virtual void SetUpOnMainThread() OVERRIDE { |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
330 IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) { | 337 IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) { |
331 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 338 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
332 NavigateToURL(shell(), url); | 339 NavigateToURL(shell(), url); |
333 | 340 |
334 EXPECT_TRUE( | 341 EXPECT_TRUE( |
335 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); | 342 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); |
336 ExpectTitle("OK"); | 343 ExpectTitle("OK"); |
337 } | 344 } |
338 | 345 |
339 } // namespace content | 346 } // namespace content |
OLD | NEW |