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

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

Issue 803813003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/test_blink_web_unit_test_support.cc ('k') | content/zygote/zygote_linux.cc » ('j') | 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) 20 #if defined(OS_WIN)
21 #include "base/win/windows_version.h" 21 #include "base/win/windows_version.h"
22 #endif 22 #endif
23 23
24 namespace content { 24 namespace content {
25 25
26 void WebRtcContentBrowserTest::SetUpCommandLine(CommandLine* command_line) { 26 void WebRtcContentBrowserTest::SetUpCommandLine(
27 base::CommandLine* command_line) {
27 // Assume this is set by the content test launcher. 28 // Assume this is set by the content test launcher.
28 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 29 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
29 switches::kUseFakeUIForMediaStream)); 30 switches::kUseFakeUIForMediaStream));
30 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 31 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
31 switches::kUseFakeDeviceForMediaStream)); 32 switches::kUseFakeDeviceForMediaStream));
32 33
33 // Always include loopback interface in network list, in case the test device 34 // Always include loopback interface in network list, in case the test device
34 // doesn't have other interfaces available. 35 // doesn't have other interfaces available.
35 CommandLine::ForCurrentProcess()->AppendSwitch( 36 base::CommandLine::ForCurrentProcess()->AppendSwitch(
36 switches::kAllowLoopbackInPeerConnection); 37 switches::kAllowLoopbackInPeerConnection);
37 } 38 }
38 39
39 void WebRtcContentBrowserTest::SetUp() { 40 void WebRtcContentBrowserTest::SetUp() {
40 // We need pixel output when we dig pixels out of video tags for verification. 41 // We need pixel output when we dig pixels out of video tags for verification.
41 EnablePixelOutput(); 42 EnablePixelOutput();
42 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
43 chromeos::CrasAudioHandler::InitializeForTesting(); 44 chromeos::CrasAudioHandler::InitializeForTesting();
44 #endif 45 #endif
45 ContentBrowserTest::SetUp(); 46 ContentBrowserTest::SetUp();
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 107
107 bool WebRtcContentBrowserTest::OnWinXp() const { 108 bool WebRtcContentBrowserTest::OnWinXp() const {
108 #if defined(OS_WIN) 109 #if defined(OS_WIN)
109 return base::win::GetVersion() <= base::win::VERSION_XP; 110 return base::win::GetVersion() <= base::win::VERSION_XP;
110 #else 111 #else
111 return false; 112 return false;
112 #endif 113 #endif
113 } 114 }
114 115
115 } // namespace content 116 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_blink_web_unit_test_support.cc ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698