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

Side by Side Diff: content/test/webrtc_content_browsertest_base.cc

Issue 669593002: Disabling flaky WebRtcAecDumpBrowserTest.TwoCallsWithAecDump on Win XP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed silly compilation error Created 6 years, 2 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 | « content/test/webrtc_content_browsertest_base.h ('k') | 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/test/webrtc_content_browsertest_base.h" 5 #include "content/test/webrtc_content_browsertest_base.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/public/test/browser_test_utils.h" 11 #include "content/public/test/browser_test_utils.h"
12 #include "content/public/test/content_browser_test_utils.h" 12 #include "content/public/test/content_browser_test_utils.h"
13 #include "content/shell/browser/shell.h" 13 #include "content/shell/browser/shell.h"
14 #include "media/base/media_switches.h" 14 #include "media/base/media_switches.h"
15 15
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 #include "chromeos/audio/cras_audio_handler.h" 17 #include "chromeos/audio/cras_audio_handler.h"
18 #endif 18 #endif
19 19
20 #if defined(OS_WIN)
21 #include "base/win/windows_version.h"
22 #endif
23
20 namespace content { 24 namespace content {
21 25
22 void WebRtcContentBrowserTest::SetUpCommandLine(CommandLine* command_line) { 26 void WebRtcContentBrowserTest::SetUpCommandLine(CommandLine* command_line) {
23 // We need fake devices in this test since we want to run on naked VMs. We 27 // We need fake devices in this test since we want to run on naked VMs. We
24 // assume these switches are set by default in content_browsertests. 28 // assume these switches are set by default in content_browsertests.
25 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 29 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
26 switches::kUseFakeDeviceForMediaStream)); 30 switches::kUseFakeDeviceForMediaStream));
27 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 31 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
28 switches::kUseFakeUIForMediaStream)); 32 switches::kUseFakeUIForMediaStream));
29 33
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 94 }
91 95
92 void WebRtcContentBrowserTest::DisableOpusIfOnAndroid() { 96 void WebRtcContentBrowserTest::DisableOpusIfOnAndroid() {
93 #if defined(OS_ANDROID) 97 #if defined(OS_ANDROID)
94 // Always force iSAC 16K on Android for now (Opus is broken). 98 // Always force iSAC 16K on Android for now (Opus is broken).
95 EXPECT_EQ("isac-forced", 99 EXPECT_EQ("isac-forced",
96 ExecuteJavascriptAndReturnResult("forceIsac16KInSdp();")); 100 ExecuteJavascriptAndReturnResult("forceIsac16KInSdp();"));
97 #endif 101 #endif
98 } 102 }
99 103
104 bool WebRtcContentBrowserTest::OnWinXp() const {
105 #if defined(OS_WIN)
106 return base::win::GetVersion() <= base::win::VERSION_XP;
107 #else
108 return false;
109 #endif
110 }
111
100 } // namespace content 112 } // namespace content
OLDNEW
« no previous file with comments | « content/test/webrtc_content_browsertest_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698