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

Unified Diff: content/public/test/browser_test_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/url_utils.cc ('k') | content/public/test/content_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index f1cbbe6c40881500aced3a377ee114125a61f94c..d45b7ed816be2a9b315092d4e1b36164b11f843f 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -168,7 +168,7 @@ BrowserTestBase::~BrowserTestBase() {
}
void BrowserTestBase::SetUp() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
// Override the child process connection timeout since tests can exceed that
// when sharded.
@@ -277,9 +277,10 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
}
#endif // defined(OS_POSIX)
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTracing)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableTracing)) {
base::debug::CategoryFilter category_filter(
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kEnableTracing));
TracingController::GetInstance()->EnableRecording(
category_filter,
@@ -289,9 +290,10 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
RunTestOnMainThreadLoop();
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTracing)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableTracing)) {
base::FilePath trace_file =
- CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
switches::kEnableTracingOutput);
// If there was no file specified, put a hardcoded one in the current
// working directory.
@@ -320,7 +322,8 @@ void BrowserTestBase::CreateTestServer(const base::FilePath& test_server_base) {
void BrowserTestBase::PostTaskToInProcessRendererAndWait(
const base::Closure& task) {
- CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
+ CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess));
scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
@@ -341,7 +344,7 @@ void BrowserTestBase::UseSoftwareCompositing() {
}
bool BrowserTestBase::UsingOSMesa() const {
- CommandLine* cmd = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
return cmd->GetSwitchValueASCII(switches::kUseGL) ==
gfx::kGLImplementationOSMesaName;
}
« no previous file with comments | « content/public/common/url_utils.cc ('k') | content/public/test/content_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698