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

Unified Diff: chrome/browser/process_singleton_posix_unittest.cc

Issue 816403003: 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
« no previous file with comments | « chrome/browser/process_singleton_posix.cc ('k') | chrome/browser/process_singleton_startup_lock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/process_singleton_posix_unittest.cc
diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc
index f12e3ff448fe52db414dc36d4266f9548a15bc7b..f50e760c89e241793954fae1de2c283e54d9013a 100644
--- a/chrome/browser/process_singleton_posix_unittest.cc
+++ b/chrome/browser/process_singleton_posix_unittest.cc
@@ -46,8 +46,7 @@ class ProcessSingletonPosixTest : public testing::Test {
base::Bind(&TestableProcessSingleton::NotificationCallback,
base::Unretained(this))) {}
-
- std::vector<CommandLine::StringVector> callback_command_lines_;
+ std::vector<base::CommandLine::StringVector> callback_command_lines_;
using ProcessSingleton::NotifyOtherProcessWithTimeout;
using ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate;
@@ -55,7 +54,7 @@ class ProcessSingletonPosixTest : public testing::Test {
using ProcessSingleton::OverrideKillCallbackForTesting;
private:
- bool NotificationCallback(const CommandLine& command_line,
+ bool NotificationCallback(const base::CommandLine& command_line,
const base::FilePath& current_directory) {
callback_command_lines_.push_back(command_line.argv());
return true;
@@ -163,7 +162,8 @@ class ProcessSingletonPosixTest : public testing::Test {
ProcessSingleton::NotifyResult NotifyOtherProcess(bool override_kill) {
scoped_ptr<TestableProcessSingleton> process_singleton(
CreateProcessSingleton());
- CommandLine command_line(CommandLine::ForCurrentProcess()->GetProgram());
+ base::CommandLine command_line(
+ base::CommandLine::ForCurrentProcess()->GetProgram());
command_line.AppendArg("about:blank");
if (override_kill) {
process_singleton->OverrideCurrentPidForTesting(
@@ -182,7 +182,8 @@ class ProcessSingletonPosixTest : public testing::Test {
const std::string& url) {
scoped_ptr<TestableProcessSingleton> process_singleton(
CreateProcessSingleton());
- CommandLine command_line(CommandLine::ForCurrentProcess()->GetProgram());
+ base::CommandLine command_line(
+ base::CommandLine::ForCurrentProcess()->GetProgram());
command_line.AppendArg(url);
return process_singleton->NotifyOtherProcessWithTimeoutOrCreate(
command_line, kRetryAttempts, timeout());
« no previous file with comments | « chrome/browser/process_singleton_posix.cc ('k') | chrome/browser/process_singleton_startup_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698