Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc

Issue 882713003: Disable WebRtcSimulcastBrowserTest.TestVgaReturnsTwoSimulcastStreams on Win (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 20 matching lines...) Expand all
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 // 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
42 #if defined(OS_WIN)
43 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc astStreams
44 #else
45 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream s
46 #endif
41 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, 47 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest,
42 TestVgaReturnsTwoSimulcastStreams) { 48 MAYBE_TestVgaReturnsTwoSimulcastStreams) {
43 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 49 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
44 50
45 ui_test_utils::NavigateToURL( 51 ui_test_utils::NavigateToURL(
46 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); 52 browser(), embedded_test_server()->GetURL(kSimulcastTestPage));
47 53
48 content::WebContents* tab_contents = 54 content::WebContents* tab_contents =
49 browser()->tab_strip_model()->GetActiveWebContents(); 55 browser()->tab_strip_model()->GetActiveWebContents();
50 56
51 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", 57 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()",
52 tab_contents)); 58 tab_contents));
53 } 59 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698