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 15 matching lines...) Expand all Loading... |
26 // Simulcast integration test. This test ensures 'a=x-google-flag:conference' | 26 // Simulcast integration test. This test ensures 'a=x-google-flag:conference' |
27 // is working and that Chrome is capable of sending simulcast streams. | 27 // is working and that Chrome is capable of sending simulcast streams. |
28 class WebRtcSimulcastBrowserTest : public WebRtcTestBase { | 28 class WebRtcSimulcastBrowserTest : public WebRtcTestBase { |
29 public: | 29 public: |
30 // TODO(phoglund): Make it possible to enable DetectErrorsInJavaScript() here. | 30 // TODO(phoglund): Make it possible to enable DetectErrorsInJavaScript() here. |
31 | 31 |
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 // The video playback will not work without a GPU, so force its use here. |
| 37 command_line->AppendSwitch(switches::kUseGpuInTests); |
| 38 |
36 // Use fake devices in order to run on VMs. | 39 // Use fake devices in order to run on VMs. |
37 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); | 40 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); |
38 } | 41 } |
39 }; | 42 }; |
40 | 43 |
41 // Fails/times out on Win only. http://crbug.com/452623 | 44 // Fails/times out on Win only. http://crbug.com/452623 |
42 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
43 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams | 46 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc
astStreams |
44 #else | 47 #else |
45 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s | 48 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream
s |
46 #endif | 49 #endif |
47 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, | 50 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, |
48 MAYBE_TestVgaReturnsTwoSimulcastStreams) { | 51 MAYBE_TestVgaReturnsTwoSimulcastStreams) { |
49 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 52 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
50 | 53 |
51 ui_test_utils::NavigateToURL( | 54 ui_test_utils::NavigateToURL( |
52 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); | 55 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); |
53 | 56 |
54 content::WebContents* tab_contents = | 57 content::WebContents* tab_contents = |
55 browser()->tab_strip_model()->GetActiveWebContents(); | 58 browser()->tab_strip_model()->GetActiveWebContents(); |
56 | 59 |
57 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", | 60 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", |
58 tab_contents)); | 61 tab_contents)); |
59 } | 62 } |
OLD | NEW |