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

Unified Diff: chrome/browser/apps/app_browsertest_util.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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
Index: chrome/browser/apps/app_browsertest_util.cc
diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc
index 59f913f8ea15d541fece289b99b4646c1afadc65..712a2c6258898628e5a526420eb3655988a4d941 100644
--- a/chrome/browser/apps/app_browsertest_util.cc
+++ b/chrome/browser/apps/app_browsertest_util.cc
@@ -40,7 +40,7 @@ PlatformAppBrowserTest::PlatformAppBrowserTest() {
ChromeAppDelegate::DisableExternalOpenForTesting();
}
-void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
+void PlatformAppBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
// Skips ExtensionApiTest::SetUpCommandLine.
ExtensionBrowserTest::SetUpCommandLine(command_line);
@@ -196,9 +196,9 @@ size_t PlatformAppBrowserTest::GetAppWindowCountForApp(
}
void PlatformAppBrowserTest::ClearCommandLineArgs() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- CommandLine::StringVector args = command_line->GetArgs();
- CommandLine::StringVector argv = command_line->argv();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ base::CommandLine::StringVector args = command_line->GetArgs();
+ base::CommandLine::StringVector argv = command_line->argv();
for (size_t i = 0; i < args.size(); i++)
argv.pop_back();
command_line->InitFromArgv(argv);
@@ -206,7 +206,7 @@ void PlatformAppBrowserTest::ClearCommandLineArgs() {
void PlatformAppBrowserTest::SetCommandLineArg(const std::string& test_file) {
ClearCommandLineArgs();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
base::FilePath test_doc(test_data_dir_.AppendASCII(test_file));
test_doc = test_doc.NormalizePathSeparators();
command_line->AppendArgPath(test_doc);
@@ -271,7 +271,7 @@ AppWindow* PlatformAppBrowserTest::CreateTestAppWindow(
}
void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
PlatformAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
}
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698