commit 0f12369653938f77b6c3132911109a63d42465d4
author Avi Drissman <avi@chromium.org> Mon May 07 18:55:12 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Mon May 07 18:55:12 2018 +0000
tree a7fa55ecafb44408b7b9d8c8794708b5085719c3
parent 425c985f61a1a70119c4d6f52da4aa619db753dc

Fully move PathService into the base namespace.

BUG=838398

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_compile_x64_dbg;master.tryserver.chromium.android:android_compile_x86_dbg;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.linux:linux_vr;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.win:win10_chromium_x64_rel_ng
Change-Id: Ibb79d0d8090cece52d7a20269153718992c8c2d1
Reviewed-on: https://chromium-review.googlesource.com/1036570
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#556512}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ea15ea06b514d9a95af39d7e35235fdf948da0c8

tools/gn/command_format_unittest.cc

diff --git a/tools/gn/command_format_unittest.cc b/tools/gn/command_format_unittest.cc
index c351df0..1780eb4 100644
--- a/tools/gn/command_format_unittest.cc
+++ b/tools/gn/command_format_unittest.cc
@@ -20,7 +20,7 @@
     std::string out;                                                        \
     std::string expected;                                                   \
     base::FilePath src_dir;                                                 \
-    PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);                      \
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);                \
     base::SetCurrentDirectory(src_dir);                                     \
     EXPECT_TRUE(commands::FormatFileToString(                               \
         &setup, SourceFile("//tools/gn/format_test_data/" #n ".gn"), false, \

tools/gn/ninja_build_writer.cc

diff --git a/tools/gn/ninja_build_writer.cc b/tools/gn/ninja_build_writer.cc
index 2f782f0..075592c 100644
--- a/tools/gn/ninja_build_writer.cc
+++ b/tools/gn/ninja_build_writer.cc
@@ -52,7 +52,7 @@
       build_settings->build_dir().Resolve(build_settings->root_path());
 
   base::FilePath exe_path;
-  PathService::Get(base::FILE_EXE, &exe_path);
+  base::PathService::Get(base::FILE_EXE, &exe_path);
   if (build_path.IsAbsolute())
     exe_path = MakeAbsoluteFilePathRelativeIfPossible(build_path, exe_path);