OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "chrome/browser/media/webrtc_browsertest_base.h" | 8 #include "chrome/browser/media/webrtc_browsertest_base.h" |
9 #include "chrome/browser/media/webrtc_browsertest_common.h" | 9 #include "chrome/browser/media/webrtc_browsertest_common.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 | 44 |
45 // Fails/times out on Windows and Chrome OS. http://crbug.com/452623 | 45 // Fails/times out on Windows and Chrome OS. http://crbug.com/452623 |
46 // MSan reports errors. http://crbug.com/452892 | 46 // MSan reports errors. http://crbug.com/452892 |
47 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(MEMORY_SANITIZER) | 47 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(MEMORY_SANITIZER) |
48 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams | 48 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams |
49 #else | 49 #else |
50 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s | 50 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s |
51 #endif | 51 #endif |
52 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, | 52 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, |
53 MAYBE_TestVgaReturnsTwoSimulcastStreams) { | 53 MAYBE_TestVgaReturnsTwoSimulcastStreams) { |
54 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 54 ASSERT_TRUE(embedded_test_server()->Start()); |
55 | 55 |
56 ui_test_utils::NavigateToURL( | 56 ui_test_utils::NavigateToURL( |
57 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); | 57 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); |
58 | 58 |
59 content::WebContents* tab_contents = | 59 content::WebContents* tab_contents = |
60 browser()->tab_strip_model()->GetActiveWebContents(); | 60 browser()->tab_strip_model()->GetActiveWebContents(); |
61 | 61 |
62 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", | 62 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", |
63 tab_contents)); | 63 tab_contents)); |
64 } | 64 } |
OLD | NEW |