Move some uses of PathService into the base namespace.

BUG=838398

Change-Id: I70402b8b38ed28f7a1265d706c9824025c43ca1c
Reviewed-on: https://chromium-review.googlesource.com/1036568
Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555078}

net/base/file_stream_unittest.cc

@@ -806,7 +806,7 @@ TEST_F(FileStreamTest, ReadError) {
 #if defined(OS_ANDROID)
 TEST_F(FileStreamTest, ContentUriRead) {
   base::FilePath test_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
   test_dir = test_dir.AppendASCII("net");
   test_dir = test_dir.AppendASCII("data");
   test_dir = test_dir.AppendASCII("file_stream_unittest");

net/cert/internal/test_helpers.cc

@@ -73,7 +73,7 @@ ::testing::AssertionResult ReadTestDataFromPemFile(
     size_t mappings_length) {
   // Compute the full path, relative to the src/ directory.
   base::FilePath src_root;
-  PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
   base::FilePath filepath = src_root.AppendASCII(file_path_ascii);
 
   // Read the full contents of the PEM file.
@@ -295,7 +295,7 @@ bool ReadVerifyCertChainTestFromFile(const std::string& file_path_ascii,
 std::string ReadTestFileToString(const std::string& file_path_ascii) {
   // Compute the full path, relative to the src/ directory.
   base::FilePath src_root;
-  PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
   base::FilePath filepath = src_root.AppendASCII(file_path_ascii);
 
   // Read the full contents of the file.

net/disk_cache/disk_cache_test_base.cc

@@ -42,7 +42,7 @@ DiskCacheTest::~DiskCacheTest() = default;
 
 bool DiskCacheTest::CopyTestCache(const std::string& name) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("cache_tests");

net/filter/brotli_source_stream_unittest.cc

@@ -33,7 +33,7 @@ class BrotliSourceStreamTest : public PlatformTest {
 
     // Get the path of data directory.
     base::FilePath data_dir;
-    PathService::Get(base::DIR_SOURCE_ROOT, &data_dir);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &data_dir);
     data_dir = data_dir.AppendASCII("net");
     data_dir = data_dir.AppendASCII("data");
     data_dir = data_dir.AppendASCII("filter_unittests");

net/ftp/ftp_directory_listing_parser_unittest.cc

@@ -37,7 +37,7 @@ class FtpDirectoryListingParserTest
 TEST_P(FtpDirectoryListingParserTest, Parse) {
   FtpTestParam param = GetParam();
   base::FilePath test_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
   test_dir = test_dir.AppendASCII("net");
   test_dir = test_dir.AppendASCII("data");
   test_dir = test_dir.AppendASCII("ftp");

net/proxy_resolution/pac_file_fetcher_impl_unittest.cc

@@ -127,7 +127,7 @@ class RequestContext : public URLRequestContext {
 // Get a file:// url relative to net/data/proxy/pac_file_fetcher_unittest.
 GURL GetTestFileUrl(const std::string& relpath) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("pac_file_fetcher_unittest");

net/proxy_resolution/proxy_resolver_v8_tracing_unittest.cc

@@ -46,7 +46,7 @@ class ProxyResolverV8TracingTest : public testing::Test {
 
 scoped_refptr<PacFileData> LoadScriptData(const char* filename) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("proxy_resolver_v8_tracing_unittest");

net/proxy_resolution/proxy_resolver_v8_tracing_wrapper_unittest.cc

@@ -53,7 +53,7 @@ class ProxyResolverV8TracingWrapperTest : public testing::Test {
 
 scoped_refptr<PacFileData> LoadScriptData(const char* filename) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("proxy_resolver_v8_tracing_unittest");

net/proxy_resolution/proxy_resolver_v8_unittest.cc

@@ -107,7 +107,7 @@ class ProxyResolverV8Test : public testing::Test {
   // called more than once, the previous ProxyResolverV8 is deleted.
   int CreateResolver(const char* filename) {
     base::FilePath path;
-    PathService::Get(base::DIR_SOURCE_ROOT, &path);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("net");
     path = path.AppendASCII("data");
     path = path.AppendASCII("proxy_resolver_v8_unittest");

net/spdy/core/fuzzing/hpack_fuzz_util_test.cc

@@ -110,7 +110,7 @@ TEST(HpackFuzzUtilTest, PassValidInputThroughAllStages) {
 
 TEST(HpackFuzzUtilTest, ValidFuzzExamplesRegressionTest) {
   base::FilePath source_root;
-  ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
+  ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
 
   // Load the example fixtures versioned with the source tree.
   HpackFuzzUtil::Input input;

net/test/embedded_test_server/default_handlers.cc

@@ -375,7 +375,7 @@ std::unique_ptr<HttpResponse> HandleAuthBasic(const HttpRequest& request) {
       base::FilePath().AppendASCII(request.relative_url.substr(1));
   if (file_path.FinalExtension() == FILE_PATH_LITERAL("gif")) {
     base::FilePath server_root;
-    PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
     base::FilePath gif_path = server_root.AppendASCII(kLogoPath);
     std::string gif_data;
     base::ReadFileToString(gif_path, &gif_data);

net/test/embedded_test_server/embedded_test_server.cc

@@ -307,14 +307,14 @@ void EmbeddedTestServer::ServeFilesFromDirectory(
 void EmbeddedTestServer::ServeFilesFromSourceDirectory(
     const std::string& relative) {
   base::FilePath test_data_dir;
-  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+  CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
   ServeFilesFromDirectory(test_data_dir.AppendASCII(relative));
 }
 
 void EmbeddedTestServer::ServeFilesFromSourceDirectory(
     const base::FilePath& relative) {
   base::FilePath test_data_dir;
-  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+  CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
   ServeFilesFromDirectory(test_data_dir.Append(relative));
 }
 

net/test/embedded_test_server/embedded_test_server_unittest.cc

@@ -250,7 +250,7 @@ TEST_P(EmbeddedTestServerTest, RegisterRequestHandler) {
 
 TEST_P(EmbeddedTestServerTest, ServeFilesFromDirectory) {
   base::FilePath src_dir;
-  ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
+  ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
   server_->ServeFilesFromDirectory(
       src_dir.AppendASCII("net").AppendASCII("data"));
   ASSERT_TRUE(server_->Start());
@@ -270,7 +270,7 @@ TEST_P(EmbeddedTestServerTest, ServeFilesFromDirectory) {
 
 TEST_P(EmbeddedTestServerTest, MockHeadersWithoutCRLF) {
   base::FilePath src_dir;
-  ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
+  ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
   server_->ServeFilesFromDirectory(
       src_dir.AppendASCII("net").AppendASCII("data").AppendASCII(
           "embedded_test_server"));
@@ -529,7 +529,7 @@ class EmbeddedTestServerThreadingTestDelegate
     // Create the test server instance.
     EmbeddedTestServer server(type_);
     base::FilePath src_dir;
-    ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
+    ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
     ASSERT_TRUE(server.Start());
 
     // Make a request and wait for the reply.

net/test/python_utils.cc

@@ -61,7 +61,7 @@ void AppendToPythonPath(const base::FilePath& dir) {
 bool GetPyProtoPath(base::FilePath* dir) {
   // Locate the Python code generated by the protocol buffers compiler.
   base::FilePath generated_code_dir;
-  if (!PathService::Get(base::DIR_EXE, &generated_code_dir)) {
+  if (!base::PathService::Get(base::DIR_EXE, &generated_code_dir)) {
     LOG(ERROR) << "Can't find " << generated_code_dir.value();
     return false;
   }

net/test/spawned_test_server/base_test_server.cc

@@ -106,7 +106,7 @@ bool GetLocalCertificatesDir(const base::FilePath& certificates_dir,
   }
 
   base::FilePath src_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
     return false;
 
   *local_certificates_dir = src_dir.Append(certificates_dir);

net/test/spawned_test_server/local_test_server.cc

@@ -77,7 +77,7 @@ LocalTestServer::~LocalTestServer() {
 
 bool LocalTestServer::GetTestServerPath(base::FilePath* testserver_path) const {
   base::FilePath testserver_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
@@ -148,7 +148,7 @@ bool LocalTestServer::Init(const base::FilePath& document_root) {
   DCHECK(!GetPort());
 
   base::FilePath src_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
     return false;
   SetResourcePath(src_dir.Append(document_root),
                   src_dir.AppendASCII("net")
@@ -162,7 +162,7 @@ bool LocalTestServer::SetPythonPath() const {
   ClearPythonPath();
 
   base::FilePath third_party_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }

net/test/spawned_test_server/local_test_server_posix.cc

@@ -141,7 +141,8 @@ bool LocalTestServer::LaunchPython(const base::FilePath& testserver_path) {
   base::LaunchOptions options;
 
   // Set CWD to source root.
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &options.current_directory)) {
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT,
+                              &options.current_directory)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }

net/test/spawned_test_server/local_test_server_win.cc

@@ -128,8 +128,8 @@ bool LocalTestServer::LaunchPython(const base::FilePath& testserver_path) {
   base::LaunchOptions launch_options;
 
   // Set CWD to source root.
-  if (!PathService::Get(base::DIR_SOURCE_ROOT,
-                        &launch_options.current_directory)) {
+  if (!base::PathService::Get(base::DIR_SOURCE_ROOT,
+                              &launch_options.current_directory)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }

net/test/spawned_test_server/remote_test_server.cc

@@ -190,7 +190,7 @@ bool RemoteTestServer::Stop() {
 // device.
 base::FilePath RemoteTestServer::GetDocumentRoot() const {
   base::FilePath src_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
   return src_dir.Append(document_root());
 }
 

net/test/spawned_test_server/remote_test_server_config.cc

@@ -27,11 +27,11 @@ namespace {
 base::FilePath GetTestServerConfigFilePath() {
   base::FilePath dir;
 #if defined(OS_ANDROID)
-  PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE, &dir);
+  base::PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE, &dir);
 #elif defined(OS_FUCHSIA)
   dir = base::FilePath("/data");
 #else
-  PathService::Get(base::DIR_TEMP, &dir);
+  base::PathService::Get(base::DIR_TEMP, &dir);
 #endif
   return dir.AppendASCII("net-test-server-config");
 }

net/test/test_data_directory.cc

@@ -26,7 +26,7 @@ base::FilePath GetTestNetDataDirectory() {
   base::FilePath src_root;
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io_for_path_service;
-    PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
   }
 
   return src_root.Append(kNetDataRelativePath);

net/tools/content_decoder_tool/content_decoder_tool_unittest.cc

@@ -35,7 +35,7 @@ class ContentDecoderToolTest : public PlatformTest {
 
     // Get the path of data directory.
     base::FilePath data_dir;
-    PathService::Get(base::DIR_SOURCE_ROOT, &data_dir);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &data_dir);
     data_dir = data_dir.AppendASCII("net");
     data_dir = data_dir.AppendASCII("data");
     data_dir = data_dir.AppendASCII("filter_unittests");

net/tools/crash_cache/crash_cache.cc

@@ -45,7 +45,7 @@ using disk_cache::RankCrashes;
 // Starts a new process, to generate the files.
 int RunSlave(RankCrashes action) {
   base::FilePath exe;
-  PathService::Get(base::FILE_EXE, &exe);
+  base::PathService::Get(base::FILE_EXE, &exe);
 
   base::CommandLine cmdline(exe);
   cmdline.AppendArg(base::IntToString(action));
@@ -373,7 +373,7 @@ int main(int argc, const char* argv[]) {
   }
 
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("net");
   path = path.AppendASCII("data");
   path = path.AppendASCII("cache_tests");

net/tools/quic/quic_http_response_cache_test.cc

@@ -32,7 +32,7 @@ class QuicHttpResponseCacheTest : public QuicTest {
 
   string CacheDirectory() {
     base::FilePath path;
-    PathService::Get(base::DIR_SOURCE_ROOT, &path);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("net").AppendASCII("data").AppendASCII(
         "quic_http_response_cache_data");
     // The file path is known to be an ascii string.

net/tools/stress_cache/stress_cache.cc

@@ -58,7 +58,7 @@ const int kExpectedCrash = 100;
 // Starts a new process.
 int RunSlave(int iteration) {
   base::FilePath exe;
-  PathService::Get(base::FILE_EXE, &exe);
+  base::PathService::Get(base::FILE_EXE, &exe);
 
   base::CommandLine cmdline(exe);
   cmdline.AppendArg(base::IntToString(iteration));
@@ -300,7 +300,7 @@ void StressTheCache(int iteration) {
   uint32_t mask = 0xfff;       // 4096 entries.
 
   base::FilePath path;
-  PathService::Get(base::DIR_TEMP, &path);
+  base::PathService::Get(base::DIR_TEMP, &path);
   path = path.AppendASCII("cache_test_stress");
 
   base::Thread cache_thread("CacheThread");

net/tools/tld_cleanup/tld_cleanup.cc

@@ -56,7 +56,7 @@ int main(int argc, const char* argv[]) {
   base::CommandLine::Init(argc, argv);
 
   base::FilePath log_filename;
-  PathService::Get(base::DIR_EXE, &log_filename);
+  base::PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("tld_cleanup.log");
   logging::LoggingSettings settings;
   settings.logging_dest = destination;
@@ -67,14 +67,14 @@ int main(int argc, const char* argv[]) {
   base::i18n::InitializeICU();
 
   base::FilePath input_file;
-  PathService::Get(base::DIR_SOURCE_ROOT, &input_file);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &input_file);
   input_file = input_file.Append(FILE_PATH_LITERAL("net"))
                          .Append(FILE_PATH_LITERAL("base"))
                          .Append(FILE_PATH_LITERAL(
                              "registry_controlled_domains"))
                          .Append(FILE_PATH_LITERAL("effective_tld_names.dat"));
   base::FilePath output_file;
-  PathService::Get(base::DIR_SOURCE_ROOT, &output_file);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &output_file);
   output_file = output_file.Append(FILE_PATH_LITERAL("net"))
                            .Append(FILE_PATH_LITERAL("base"))
                            .Append(FILE_PATH_LITERAL(

net/url_request/url_fetcher_impl_unittest.cc

@@ -77,7 +77,7 @@ const char kCreateUploadStreamBody[] = "rosebud";
 
 base::FilePath GetUploadFileTestPath() {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   return path.Append(
       FILE_PATH_LITERAL("net/data/url_request_unittest/BullRunSpeech.txt"));
 }
@@ -419,7 +419,7 @@ class URLFetcherTest : public testing::Test {
     }
 
     base::FilePath server_root;
-    PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
 
     EXPECT_TRUE(base::ContentsEqual(
         server_root.Append(kDocRoot).AppendASCII(file_to_fetch), out_path));
@@ -1019,7 +1019,7 @@ TEST_F(URLFetcherTest, DownloadProgress) {
   std::string file_contents;
 
   base::FilePath server_root;
-  PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
 
   ASSERT_TRUE(base::ReadFileToString(
       server_root.Append(kDocRoot).AppendASCII(kFileToFetch), &file_contents));

net/url_request/url_request_file_job_unittest.cc

@@ -357,7 +357,7 @@ TEST_F(URLRequestFileJobEventsTest, DecodeSvgzFile) {
 
 TEST_F(URLRequestFileJobEventsTest, OpenNonExistentFile) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.Append(
       FILE_PATH_LITERAL("net/data/url_request_unittest/non-existent.txt"));
 
@@ -375,7 +375,7 @@ TEST_F(URLRequestFileJobEventsTest, OpenNonExistentFile) {
 
 TEST_F(URLRequestFileJobEventsTest, MultiRangeRequestNotSupported) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.Append(
       FILE_PATH_LITERAL("net/data/url_request_unittest/BullRunSpeech.txt"));
 
@@ -394,7 +394,7 @@ TEST_F(URLRequestFileJobEventsTest, MultiRangeRequestNotSupported) {
 
 TEST_F(URLRequestFileJobEventsTest, RangeExceedingFileSize) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.Append(
       FILE_PATH_LITERAL("net/data/url_request_unittest/BullRunSpeech.txt"));
 
@@ -413,7 +413,7 @@ TEST_F(URLRequestFileJobEventsTest, RangeExceedingFileSize) {
 
 TEST_F(URLRequestFileJobEventsTest, IgnoreRangeParsingError) {
   base::FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.Append(
       FILE_PATH_LITERAL("net/data/url_request_unittest/simple.html"));