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

Unified Diff: content/shell/browser/layout_test/layout_test_browser_main.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/shell/app/shell_main_delegate_mac.mm ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/layout_test/layout_test_browser_main.cc
diff --git a/content/shell/browser/layout_test/layout_test_browser_main.cc b/content/shell/browser/layout_test/layout_test_browser_main.cc
index 57841fcd0e07498878f5e2941653843b656188ec..a6d90aa44a849084a8941c63384df8b0b0c890c4 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main.cc
+++ b/content/shell/browser/layout_test/layout_test_browser_main.cc
@@ -92,7 +92,7 @@ GURL GetURLForLayoutTest(const std::string& test_name,
return test_url;
}
-bool GetNextTest(const CommandLine::StringVector& args,
+bool GetNextTest(const base::CommandLine::StringVector& args,
size_t* position,
std::string* test) {
if (*position >= args.size())
@@ -157,7 +157,8 @@ int RunTests(const scoped_ptr<content::BrowserMainRunner>& main_runner) {
test_controller.SetTempPath(temp_path);
}
std::string test_string;
- CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
+ base::CommandLine::StringVector args =
+ base::CommandLine::ForCurrentProcess()->GetArgs();
size_t command_line_position = 0;
bool ran_at_least_once = false;
@@ -194,7 +195,7 @@ int LayoutTestBrowserMain(
CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
CHECK(!browser_context_path_for_layout_tests.path().MaybeAsASCII().empty());
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kContentShellDataPath,
browser_context_path_for_layout_tests.path().MaybeAsASCII());
@@ -209,7 +210,7 @@ int LayoutTestBrowserMain(
if (exit_code >= 0)
return exit_code;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kCheckLayoutTestSysDeps)) {
base::MessageLoop::current()->PostTask(FROM_HERE,
base::MessageLoop::QuitClosure());
« no previous file with comments | « content/shell/app/shell_main_delegate_mac.mm ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698