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 21 matching lines...) Expand all Loading... |
32 void SetUpCommandLine(base::CommandLine* command_line) override { | 32 void SetUpCommandLine(base::CommandLine* command_line) override { |
33 // Just answer 'allow' to GetUserMedia invocations. | 33 // Just answer 'allow' to GetUserMedia invocations. |
34 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); | 34 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); |
35 | 35 |
36 // Use fake devices in order to run on VMs. | 36 // Use fake devices in order to run on VMs. |
37 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); | 37 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); |
38 } | 38 } |
39 }; | 39 }; |
40 | 40 |
41 // Fails/times out on Win only. http://crbug.com/452623 | 41 // Fails/times out on Win only. http://crbug.com/452623 |
42 #if defined(OS_WIN) | 42 // MSan reports errors. http://crbug.com/452892 |
| 43 #if defined(OS_WIN) || defined(MEMORY_SANITIZER) |
43 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams | 44 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams |
44 #else | 45 #else |
45 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s | 46 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s |
46 #endif | 47 #endif |
47 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, | 48 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, |
48 MAYBE_TestVgaReturnsTwoSimulcastStreams) { | 49 MAYBE_TestVgaReturnsTwoSimulcastStreams) { |
49 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 50 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
50 | 51 |
51 ui_test_utils::NavigateToURL( | 52 ui_test_utils::NavigateToURL( |
52 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); | 53 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); |
53 | 54 |
54 content::WebContents* tab_contents = | 55 content::WebContents* tab_contents = |
55 browser()->tab_strip_model()->GetActiveWebContents(); | 56 browser()->tab_strip_model()->GetActiveWebContents(); |
56 | 57 |
57 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", | 58 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", |
58 tab_contents)); | 59 tab_contents)); |
59 } | 60 } |
OLD | NEW |