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
commitb000aae2c03cc3fa6980f57993a52a81363b3518 (patch)
tree7d1ba63918cb331729a1caa7b9c9de6b55d7d10f
parent239469e41988c62504a59d4880403481e79fafd5 (diff)
downloaddbus-binding-generator-b000aae2c03cc3fa6980f57993a52a81363b3518.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--chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc4
-rw-r--r--chromeos-dbus-bindings/testrunner.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc b/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
index b8f1454..a748843 100644
--- a/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
+++ b/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
@@ -122,8 +122,8 @@ bool LoadConfig(const base::FilePath& path, ServiceConfig *config) {
} // anonymous namespace
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();
// Setup logging to stderr. This also parses some implicit flags using the
// CommandLine singleton.
diff --git a/chromeos-dbus-bindings/testrunner.cc b/chromeos-dbus-bindings/testrunner.cc
index 766c3f2..0777904 100644
--- a/chromeos-dbus-bindings/testrunner.cc
+++ b/chromeos-dbus-bindings/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();