From 429bbdd261e1530b951ba528081343d2c9947408 Mon Sep 17 00:00:00 2001 From: avi Date: Mon, 22 Dec 2014 16:27:27 -0800 Subject: Make callers of CommandLine use it via the base:: namespace. Covers jingle/, media/, ppapi/, remoting/, rlz/, skia/, and sync/. BUG=422426 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/819203002 Cr-Commit-Position: refs/heads/master@{#309502} --- sync/tools/sync_client.cc | 10 +++++----- sync/tools/sync_listen_notifications.cc | 10 +++++----- sync/tools/testserver/run_sync_testserver.cc | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'sync/tools') diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index d8da0d8..af3af65 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -255,9 +255,8 @@ void LogUnrecoverableErrorContext() { } notifier::NotifierOptions ParseNotifierOptions( - const CommandLine& command_line, - const scoped_refptr& - request_context_getter) { + const base::CommandLine& command_line, + const scoped_refptr& request_context_getter) { notifier::NotifierOptions notifier_options; notifier_options.request_context_getter = request_context_getter; notifier_options.auth_mechanism = "X-OAUTH2"; @@ -293,7 +292,7 @@ int SyncClientMain(int argc, char* argv[]) { base::mac::ScopedNSAutoreleasePool pool; #endif base::AtExitManager exit_manager; - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; logging::InitLogging(settings); @@ -305,7 +304,8 @@ int SyncClientMain(int argc, char* argv[]) { io_thread.StartWithOptions(options); // Parse command line. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); SyncCredentials credentials; credentials.email = command_line.GetSwitchValueASCII(kEmailSwitch); credentials.sync_token = command_line.GetSwitchValueASCII(kTokenSwitch); diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 3fa5a33..13468a4 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -109,9 +109,8 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { }; notifier::NotifierOptions ParseNotifierOptions( - const CommandLine& command_line, - const scoped_refptr& - request_context_getter) { + const base::CommandLine& command_line, + const scoped_refptr& request_context_getter) { notifier::NotifierOptions notifier_options; notifier_options.request_context_getter = request_context_getter; @@ -142,7 +141,7 @@ int SyncListenNotificationsMain(int argc, char* argv[]) { base::mac::ScopedNSAutoreleasePool pool; #endif base::AtExitManager exit_manager; - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; logging::InitLogging(settings); @@ -154,7 +153,8 @@ int SyncListenNotificationsMain(int argc, char* argv[]) { io_thread.StartWithOptions(options); // Parse command line. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); std::string email = command_line.GetSwitchValueASCII(kEmailSwitch); std::string token = command_line.GetSwitchValueASCII(kTokenSwitch); // TODO(akalin): Write a wrapper script that gets a token for an diff --git a/sync/tools/testserver/run_sync_testserver.cc b/sync/tools/testserver/run_sync_testserver.cc index bb95013..3ae89fc 100644 --- a/sync/tools/testserver/run_sync_testserver.cc +++ b/sync/tools/testserver/run_sync_testserver.cc @@ -38,7 +38,7 @@ static bool RunSyncTest( return false; } - CommandLine python_command(CommandLine::NO_PROGRAM); + base::CommandLine python_command(base::CommandLine::NO_PROGRAM); if (!GetPythonCommand(&python_command)) { LOG(ERROR) << "Could not get python runtime command."; return false; @@ -56,7 +56,7 @@ static bool RunSyncTest( // |port|. Returns true if a port was provided and false otherwise. static bool GetPortFromSwitch(const std::string& switch_name, uint16* port) { DCHECK(port != NULL) << "|port| is NULL"; - CommandLine* command_line = CommandLine::ForCurrentProcess(); + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); int port_int = 0; if (command_line->HasSwitch(switch_name)) { std::string port_str = command_line->GetSwitchValueASCII(switch_name); @@ -73,8 +73,8 @@ int main(int argc, const char* argv[]) { base::MessageLoopForIO message_loop; // Process command line - CommandLine::Init(argc, argv); - CommandLine* command_line = CommandLine::ForCurrentProcess(); + base::CommandLine::Init(argc, argv); + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_ALL; -- cgit v1.1