commit b96ecdaafd27009a18e198f166d2b2f64a55d251
author Alex Vakulenko <avakulenko@chromium.org> Thu Apr 02 14:31:10 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Apr 03 18:33:17 2015 +0000
tree 63f5079b467222111e7def35e0faba56be07d4f3
parent 3310b228740323c12bcb3dc5f317359c84a061f8

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>

payload_generator/generate_delta_main.cc

diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 38e2c21..49d8f8b 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -388,7 +388,7 @@
   // Look for the minor version in the old image if it was not given as an
   // argument.
   if (payload_config.is_delta &&
-      !CommandLine::ForCurrentProcess()->HasSwitch("minor_version")) {
+      !base::CommandLine::ForCurrentProcess()->HasSwitch("minor_version")) {
     uint32_t minor_version;
     base::FilePath image_path(FLAGS_old_dir);
     base::FilePath conf_loc("etc/update_engine.conf");

testrunner.cc

diff --git a/testrunner.cc b/testrunner.cc
index 139de75..6ca791e 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -29,7 +29,7 @@
   chromeos_update_engine::Terminator::Init(2);
   chromeos_update_engine::Subprocess::Init();
   LOG(INFO) << "parsing command line arguments";
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   LOG(INFO) << "initializing gtest";
   ::testing::InitGoogleTest(&argc, argv);
   LOG(INFO) << "running unit tests";