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

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

Issue 858153004: Disable WebRtcSimulcastBrowserTest.TestVgaReturnsTwoSimulcastStreams on Chrome OS (Closed) Base URL: https://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 23 matching lines...) Expand all
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. 36 // The video playback will not work without a GPU, so force its use here.
37 command_line->AppendSwitch(switches::kUseGpuInTests); 37 command_line->AppendSwitch(switches::kUseGpuInTests);
38 38
39 // Use fake devices in order to run on VMs. 39 // Use fake devices in order to run on VMs.
40 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 40 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
41 } 41 }
42 }; 42 };
43 43
44 // Fails/times out on Win only. http://crbug.com/452623 44 // Fails/times out on Windows and Chrome OS. http://crbug.com/452623
45 // MSan reports errors. http://crbug.com/452892 45 // MSan reports errors. http://crbug.com/452892
46 #if defined(OS_WIN) || defined(MEMORY_SANITIZER) 46 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(MEMORY_SANITIZER)
47 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc astStreams 47 #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulc astStreams
48 #else 48 #else
49 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream s 49 #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStream s
50 #endif 50 #endif
51 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, 51 IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest,
52 MAYBE_TestVgaReturnsTwoSimulcastStreams) { 52 MAYBE_TestVgaReturnsTwoSimulcastStreams) {
53 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 53 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
54 54
55 ui_test_utils::NavigateToURL( 55 ui_test_utils::NavigateToURL(
56 browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); 56 browser(), embedded_test_server()->GetURL(kSimulcastTestPage));
57 57
58 content::WebContents* tab_contents = 58 content::WebContents* tab_contents =
59 browser()->tab_strip_model()->GetActiveWebContents(); 59 browser()->tab_strip_model()->GetActiveWebContents();
60 60
61 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()", 61 ASSERT_EQ("OK", ExecuteJavascript("testVgaReturnsTwoSimulcastStreams()",
62 tab_contents)); 62 tab_contents));
63 } 63 }
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