summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2015-04-02 14:31:10 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-04-03 18:33:17 +0000
commit7f267ab51daeda0fb685587953bd494de0226303 (patch)
tree524e596986322f4c7366f7fb89bdc1ec0ba3cbaf
parent9d7a0e8d2d6470c1818e1a75dac7d8a3fc65afe8 (diff)
downloadapmanager-7f267ab51daeda0fb685587953bd494de0226303.tar.gz
platform2: Explicitly use base:: namespace with CommandLine
The current revision of libchrome is removing CommandLine class from global namespace and only retain the one in base::. Sweep the code to use the correct namespace in anticpation of libchrome revision roll. BUG=None TEST=./build_packages Change-Id: Ib7ca448dac1204c1e36ab053e775a5a5214997ac Reviewed-on: https://chromium-review.googlesource.com/263785 Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Reviewed-by: Alex Deymo <deymo@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
-rw-r--r--main.cc6
-rw-r--r--testrunner.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/main.cc b/main.cc
index d5fdb55..baac20b 100644
--- a/main.cc
+++ b/main.cc
@@ -97,7 +97,7 @@ void DropPrivileges(chromeos::Minijail* minijail) {
minijail->Destroy(jail);
}
-void OnStartup(const char* daemon_name, CommandLine* cl) {
+void OnStartup(const char* daemon_name, base::CommandLine* cl) {
chromeos::Minijail* minijail = chromeos::Minijail::GetInstance();
SetupLogging(minijail, cl->HasSwitch(switches::kForeground), daemon_name);
@@ -109,8 +109,8 @@ void OnStartup(const char* daemon_name, CommandLine* cl) {
}
int main(int argc, char* argv[]) {
- CommandLine::Init(argc, argv);
- CommandLine* cl = CommandLine::ForCurrentProcess();
+ base::CommandLine::Init(argc, argv);
+ base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kHelp)) {
LOG(INFO) << switches::kHelpMessage;
diff --git a/testrunner.cc b/testrunner.cc
index 51e1646..51bace0 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -9,7 +9,7 @@
int main(int argc, char** argv) {
base::AtExitManager exit_manager;
- CommandLine::Init(argc, argv);
+ base::CommandLine::Init(argc, argv);
chromeos::InitLog(chromeos::kLogToStderr);
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();