Move some uses of PathService into the base namespace.
BUG=838398
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr
Change-Id: I0cf62fc688cdcd8b05320f1eb96543c50a8fca51
Reviewed-on: https://chromium-review.googlesource.com/1036249
Commit-Queue: Avi Drissman <[email protected]>
Reviewed-by: Drew Wilson <[email protected]>
Reviewed-by: Leonard Grey <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#555920}diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 5dac6e0f..e9fbe31 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -242,7 +242,7 @@
TEST_F(AboutFlagsHistogramTest, CheckHistograms) {
base::FilePath histograms_xml_file_path;
ASSERT_TRUE(
- PathService::Get(base::DIR_SOURCE_ROOT, &histograms_xml_file_path));
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &histograms_xml_file_path));
histograms_xml_file_path = histograms_xml_file_path.AppendASCII("tools")
.AppendASCII("metrics")
.AppendASCII("histograms")
diff --git a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
index 338a2dce..065b019 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
@@ -64,7 +64,7 @@
io_thread_.StartWithOptions(io_thread_options);
base::FilePath user_data_dir;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
base::FilePath symlink_path =
user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
@@ -256,10 +256,10 @@
bool AppShimHostManagerBrowserTestSocketFiles::SetUpUserDataDirectory() {
// Create an existing symlink. It should be replaced by AppShimHostManager.
base::FilePath user_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
symlink_path_ = user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
base::FilePath temp_dir;
- PathService::Get(base::DIR_TEMP, &temp_dir);
+ base::PathService::Get(base::DIR_TEMP, &temp_dir);
EXPECT_TRUE(base::CreateSymbolicLink(temp_dir.Append("chrome-XXXXXX"),
symlink_path_));
diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
index eb69ee5..9d7ffbb 100644
--- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -565,7 +565,7 @@
IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_RebuildShim) {
// Get the 32 bit shim.
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
base::FilePath shim_path_32 =
test_data_dir.Append("app_shim").Append("app_shim_32_bit.app");
EXPECT_TRUE(base::PathExists(shim_path_32));
diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
index e421c900..140847d 100644
--- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
@@ -58,7 +58,7 @@
// Load an extension.
{
base::FilePath path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &path));
path = path.AppendASCII("extensions").AppendASCII("simple_with_popup");
TestExtensionRegistryObserver load_observer(registry());
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index 89431da..61d6c5b5 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -56,7 +56,7 @@
const base::FilePath& GetTestDataDir() {
CR_DEFINE_STATIC_LOCAL(base::FilePath, dir, ());
if (dir.empty()) {
- PathService::Get(base::DIR_SOURCE_ROOT, &dir);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &dir);
dir = dir.AppendASCII("components");
dir = dir.AppendASCII("test");
dir = dir.AppendASCII("data");
diff --git a/chrome/browser/autofill/validation_rules_storage_factory.cc b/chrome/browser/autofill/validation_rules_storage_factory.cc
index 241eefd2..3cba175 100644
--- a/chrome/browser/autofill/validation_rules_storage_factory.cc
+++ b/chrome/browser/autofill/validation_rules_storage_factory.cc
@@ -27,7 +27,7 @@
ValidationRulesStorageFactory::ValidationRulesStorageFactory() {
base::FilePath user_data_dir;
- bool success = PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ bool success = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
DCHECK(success);
json_pref_store_ = new JsonPrefStore(
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 41dd9ff..6ed1aec6 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1052,7 +1052,7 @@
created_profile_manager_ = true;
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
profile_manager_ = std::make_unique<ProfileManager>(user_data_dir);
}
@@ -1060,7 +1060,7 @@
DCHECK(!local_state_);
base::FilePath local_state_path;
- CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
+ CHECK(base::PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
auto pref_registry = base::MakeRefCounted<PrefRegistrySimple>();
// Register local state preferences.
@@ -1258,7 +1258,7 @@
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
base::FilePath indexed_ruleset_base_dir =
user_data_dir.Append(subresource_filter::kTopLevelDirectoryName)
.Append(subresource_filter::kIndexedRulesetBaseDirectoryName);
@@ -1296,7 +1296,7 @@
NOTREACHED();
#else
base::FilePath store_path;
- CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path));
+ CHECK(base::PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path));
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
base::CreateSequencedTaskRunnerWithTraits(
{base::MayBlock(), base::TaskPriority::BACKGROUND,
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 77651685..c058cae 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -84,7 +84,7 @@
base::FilePath GetShutdownMsPath() {
base::FilePath shutdown_ms_file;
- PathService::Get(chrome::DIR_USER_DATA, &shutdown_ms_file);
+ base::PathService::Get(chrome::DIR_USER_DATA, &shutdown_ms_file);
return shutdown_ms_file.AppendASCII(kShutdownMsFile);
}
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index 87aca6df5..2ffc405 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -67,7 +67,7 @@
feature_list_.InitWithFeatures(
{browsing_data::features::kRemoveNavigationHistory}, {});
base::FilePath path;
- PathService::Get(content::DIR_TEST_DATA, &path);
+ base::PathService::Get(content::DIR_TEST_DATA, &path);
host_resolver()->AddRule(kExampleHost, "127.0.0.1");
embedded_test_server()->ServeFilesFromDirectory(path);
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 8ee6617..c88621f 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -837,7 +837,7 @@
// Returns the contents of the given filename under chrome/test/data.
static std::string GetContents(const std::string& path) {
base::FilePath root_http;
- PathService::Get(chrome::DIR_TEST_DATA, &root_http);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &root_http);
base::ScopedAllowBlockingForTesting allow_io;
base::FilePath file_path = root_http.AppendASCII(path);
std::string contents;
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 8441908..b4ccbf7c 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -382,7 +382,7 @@
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kParentProfile)) {
base::FilePath local_state_path;
- PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
+ base::PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
bool local_state_file_exists = base::PathExists(local_state_path);
if (!local_state_file_exists) {
base::FilePath parent_profile =
@@ -554,7 +554,7 @@
RegisterOptimizationHintsComponent(cus, profile_prefs);
base::FilePath path;
- if (PathService::Get(chrome::DIR_USER_DATA, &path)) {
+ if (base::PathService::Get(chrome::DIR_USER_DATA, &path)) {
// The CRLSet component previously resided in a different location: delete
// the old file.
component_updater::DeleteLegacyCRLSet(path);
@@ -1157,7 +1157,7 @@
base::SequencedTaskRunner* local_state_task_runner,
bool* failed_to_load_resource_bundle) {
*failed_to_load_resource_bundle = false;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_))
return chrome::RESULT_CODE_MISSING_DATA;
InitializeLocalState(local_state_task_runner);
@@ -1346,8 +1346,8 @@
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
base::FilePath user_native_messaging_dir;
- CHECK(PathService::Get(chrome::DIR_USER_NATIVE_MESSAGING,
- &user_native_messaging_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_NATIVE_MESSAGING,
+ &user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
#endif // defined(OS_MACOSX) || defined(OS_LINUX)
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
index db13c4df..5e4db96 100644
--- a/chrome/browser/chrome_browser_main_android.cc
+++ b/chrome/browser/chrome_browser_main_android.cc
@@ -69,7 +69,7 @@
if (breakpad_enabled) {
base::FilePath crash_dump_dir;
- PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
+ base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
std::make_unique<breakpad::ChildProcessCrashObserver>(
crash_dump_dir, kAndroidMinidumpDescriptor));
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 940e72e..bcb1a7a590 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -664,7 +664,7 @@
InstallUtil::GetChromeVersion(dist, true, &version);
if (version.IsValid()) {
base::FilePath exe_path;
- PathService::Get(base::DIR_EXE, &exe_path);
+ base::PathService::Get(base::DIR_EXE, &exe_path);
std::wstring exe = exe_path.value();
base::FilePath user_exe_path(installer::GetChromeInstallPath(false));
if (base::FilePath::CompareEqualIgnoreCase(exe, user_exe_path.value())) {
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 39685ae..5cc6edb7 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -650,7 +650,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
- PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
+ base::PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
{
ANNOTATE_SCOPED_MEMORY_LEAK;
bool upload = (getenv(env_vars::kHeadless) == NULL);
@@ -1841,7 +1841,7 @@
#if defined(OS_CHROMEOS)
// On Chrome OS need to pass primary user homedir (in multi-profiles session).
base::FilePath homedir;
- PathService::Get(base::DIR_HOME, &homedir);
+ base::PathService::Get(base::DIR_HOME, &homedir);
command_line->AppendSwitchASCII(chromeos::switches::kHomedir,
homedir.value().c_str());
#endif
@@ -2969,7 +2969,7 @@
base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() {
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
DCHECK(!user_data_dir.empty());
return user_data_dir.Append(FILE_PATH_LITERAL("ShaderCache"));
}
@@ -3122,7 +3122,7 @@
child_process_id, mappings);
base::FilePath app_data_path;
- PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
+ base::PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
DCHECK(!app_data_path.empty());
#else
int crash_signal_fd = GetCrashSignalFD(command_line);
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc
index fdf2b7d..fab61fa4 100644
--- a/chrome/browser/chrome_plugin_browsertest.cc
+++ b/chrome/browser/chrome_plugin_browsertest.cc
@@ -88,7 +88,7 @@
static GURL GetURL(const char* filename) {
base::FilePath path;
- PathService::Get(content::DIR_TEST_DATA, &path);
+ base::PathService::Get(content::DIR_TEST_DATA, &path);
path = path.AppendASCII("plugin").AppendASCII(filename);
CHECK(base::PathExists(path));
return net::FilePathToFileURL(path);
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index ce8510a7..0be50ef 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -242,7 +242,7 @@
bundle.GetRawDataResource(IDR_SOUND_DICTATION_CANCEL_WAV));
base::FilePath resources_path;
- if (!PathService::Get(chrome::DIR_RESOURCES, &resources_path))
+ if (!base::PathService::Get(chrome::DIR_RESOURCES, &resources_path))
NOTREACHED();
chromevox_loader_ = base::WrapUnique(new AccessibilityExtensionLoader(
extension_misc::kChromeVoxExtensionId,
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_data.cc
index 5c3856f..f59bd7c 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_data.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_data.cc
@@ -61,7 +61,7 @@
icon_ = icon;
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
LOG(ERROR) << "Failed to get user directory.";
return;
}
diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc
index 268686e..c8fd127 100644
--- a/chrome/browser/chromeos/app_mode/fake_cws.cc
+++ b/chrome/browser/chromeos/app_mode/fake_cws.cc
@@ -109,7 +109,7 @@
GURL crx_download_url = web_store_url_.Resolve(kCrxDownloadPath + crx_file);
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
base::FilePath crx_file_path =
test_data_dir.AppendASCII("chromeos/app_mode/webstore/downloads")
.AppendASCII(crx_file);
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
index f976dca0..b96102e 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -144,7 +144,7 @@
base::FilePath GetCrxCacheDir() {
base::FilePath user_data_dir;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
return user_data_dir.AppendASCII(kCrxCacheDir);
}
@@ -940,7 +940,7 @@
void KioskAppManager::GetKioskAppIconCacheDir(base::FilePath* cache_dir) {
base::FilePath user_data_dir;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
*cache_dir = user_data_dir.AppendASCII(kIconCacheDir);
}
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
index 6426ebc4..dc655de5 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -229,7 +229,7 @@
// InProcessBrowserTest overrides:
void SetUp() override {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
// Don't spin up the IO thread yet since no threads are allowed while
@@ -299,7 +299,7 @@
const std::string& icon_file_name,
const std::string& required_platform_version) {
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath data_dir = test_dir.AppendASCII("chromeos/app_mode/");
// Copy the icon file to temp dir for using because ClearAppData test
@@ -385,7 +385,8 @@
EXPECT_EQ(expected_required_platform_version, required_platform_version);
base::FilePath expected_icon_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));
+ ASSERT_TRUE(
+ base::PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));
expected_icon_path =
expected_icon_path.AppendASCII(KioskAppManager::kIconCacheDir)
.AppendASCII(app_id)
@@ -413,7 +414,7 @@
EXPECT_EQ(expected_version, crx_version);
// Verify the original crx file is identical to the cached file.
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
std::string src_file_path_str =
std::string("chromeos/app_mode/webstore/downloads/") + crx_file_name;
base::FilePath src_file_path = test_data_dir.Append(src_file_path_str);
@@ -580,7 +581,7 @@
// Copy test crx file to temp dir because the cache moves the file.
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath data_dir =
test_dir.AppendASCII("chromeos/app_mode/webstore/downloads/");
base::FilePath crx_file = data_dir.AppendASCII(
@@ -718,7 +719,7 @@
EXPECT_TRUE(base::PathExists(new_crx_path));
// Get original version 2 source download crx file path.
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
base::FilePath v2_file_path = test_data_dir.Append(FILE_PATH_LITERAL(
"chromeos/app_mode/webstore/downloads/"
"bmbpicmpniaclbbpdkfglgipkkebnbjf_v2_read_and_verify_data.crx"));
diff --git a/chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc
index 74fc98b..d25c306 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc
@@ -119,7 +119,7 @@
.ToJSON();
base::FilePath local_state_file;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &local_state_file));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &local_state_file));
local_state_file = local_state_file.Append(chrome::kLocalStateFilename);
base::WriteFile(local_state_file, local_state_json.data(),
local_state_json.size());
diff --git a/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.cc b/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.cc
index d81117f..0fe96bec 100644
--- a/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.cc
+++ b/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.cc
@@ -58,7 +58,7 @@
// temporary file and then replaces existing one.
void WriteFile(const std::string& file_name, const std::string& blob) {
base::FilePath dir;
- PathService::Get(base::DIR_HOME, &dir);
+ base::PathService::Get(base::DIR_HOME, &dir);
dir = dir.Append(kKrb5Directory);
base::File::Error error;
if (!base::CreateDirectoryAndGetError(dir, &error)) {
@@ -104,7 +104,7 @@
// Setting environment variables for GSSAPI library.
std::unique_ptr<base::Environment> env(base::Environment::Create());
base::FilePath path;
- PathService::Get(base::DIR_HOME, &path);
+ base::PathService::Get(base::DIR_HOME, &path);
path = path.Append(kKrb5Directory);
env->SetVar(kKrb5CCEnvName,
kKrb5CCFilePrefix + path.Append(kKrb5CCFile).value());
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index a7bfd27..8755e9d3 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -720,7 +720,8 @@
load_oem_statistics);
base::FilePath downloads_directory;
- CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
+ CHECK(base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS,
+ &downloads_directory));
DeviceOAuth2TokenServiceFactory::Initialize();
diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc
index d7b21d5..f8fd293 100644
--- a/chrome/browser/chromeos/customization/customization_document.cc
+++ b/chrome/browser/chromeos/customization/customization_document.cc
@@ -485,8 +485,8 @@
// static
base::FilePath ServicesCustomizationDocument::GetCustomizedWallpaperCacheDir() {
base::FilePath custom_wallpaper_dir;
- if (!PathService::Get(chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS,
- &custom_wallpaper_dir)) {
+ if (!base::PathService::Get(chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS,
+ &custom_wallpaper_dir)) {
LOG(DFATAL) << "Unable to get custom wallpaper dir.";
return base::FilePath();
}
diff --git a/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc b/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
index 6cf53b41..d5b6c0b 100644
--- a/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
+++ b/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
@@ -28,9 +28,9 @@
base::FilePath QuirksManagerDelegateImpl::GetDisplayProfileDirectory() const {
base::FilePath directory;
if (base::SysInfo::IsRunningOnChromeOS()) {
- PathService::Get(chromeos::DIR_DEVICE_DISPLAY_PROFILES, &directory);
+ base::PathService::Get(chromeos::DIR_DEVICE_DISPLAY_PROFILES, &directory);
} else {
- PathService::Get(chrome::DIR_USER_DATA, &directory);
+ base::PathService::Get(chrome::DIR_USER_DATA, &directory);
directory = directory.Append(kUserDataDisplayProfilesDirectory);
}
return directory;
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc
index dc0698e..d0c13c9 100644
--- a/chrome/browser/chromeos/extensions/default_app_order.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -163,7 +163,8 @@
void ExternalLoader::Load() {
base::FilePath ordinals_file;
- CHECK(PathService::Get(chromeos::FILE_DEFAULT_APP_ORDER, &ordinals_file));
+ CHECK(
+ base::PathService::Get(chromeos::FILE_DEFAULT_APP_ORDER, &ordinals_file));
std::unique_ptr<base::ListValue> ordinals_value =
ReadExternalOrdinalFile(ordinals_file);
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
index d175c96..6d5a2933 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
@@ -147,7 +147,7 @@
new net::TestURLRequestContextGetter(base::ThreadTaskRunnerHandle::Get());
TestingBrowserProcess::GetGlobal()->SetSystemRequestContext(
request_context_getter_.get());
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
loader_ = new DeviceLocalAccountExternalPolicyLoader(&store_, cache_dir_);
provider_.reset(new extensions::ExternalProviderImpl(
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 9a92275..f07a4ed 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -114,7 +114,7 @@
const std::string& file_name,
const std::vector<char>& data) {
base::FilePath data_dir;
- CHECK(PathService::Get(key, &data_dir));
+ CHECK(base::PathService::Get(key, &data_dir));
if (!base::DirectoryExists(data_dir) &&
!base::CreateDirectory(data_dir)) {
return false;
@@ -515,8 +515,8 @@
base::FilePath thumbnail_path;
if (params->source == wallpaper_private::WALLPAPER_SOURCE_ONLINE) {
std::string file_name = GURL(params->url_or_file).ExtractFileName();
- CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPER_THUMBNAILS,
- &thumbnail_path));
+ CHECK(base::PathService::Get(chrome::DIR_CHROMEOS_WALLPAPER_THUMBNAILS,
+ &thumbnail_path));
thumbnail_path = thumbnail_path.Append(file_name);
} else {
if (!IsOEMDefaultWallpaper())
diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
index d323af4..d6bcee5 100644
--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
@@ -516,7 +516,7 @@
void SetUpOnMainThread() override {
base::FilePath user_data_directory;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
session_manager::SessionManager::Get()->CreateSession(
AccountId::FromUserEmailGaiaId(kSecondProfileAccount,
kSecondProfileGiaId),
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index d4443b8..808d60a8 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -247,7 +247,7 @@
static base::FilePath GetTestDataFilePath(const std::string& file_name) {
// Get the path to file manager's test data directory.
base::FilePath source_dir;
- CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &source_dir));
+ CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_dir));
auto test_data_dir = source_dir.AppendASCII("chrome")
.AppendASCII("test")
.AppendASCII("data")
@@ -614,7 +614,7 @@
void FileManagerBrowserTestBase::LaunchExtension(const base::FilePath& path,
const char* manifest_name) {
base::FilePath source_dir;
- CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &source_dir));
+ CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_dir));
const base::FilePath source_path = source_dir.Append(path);
const extensions::Extension* const extension_launched =
diff --git a/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc
index 79d1cbc..6702e88 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc
@@ -18,7 +18,7 @@
void FileManagerJsTestBase::RunTest(const base::FilePath& file) {
base::FilePath root_path;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
const GURL url = net::FilePathToFileURL(
root_path.Append(base_path_)
diff --git a/chrome/browser/chromeos/file_manager/file_manager_uitest.cc b/chrome/browser/chromeos/file_manager/file_manager_uitest.cc
index ab4d2af..7aaa1d0 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_uitest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_uitest.cc
@@ -25,7 +25,7 @@
void RunTest() {
base::FilePath root_path;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
// Load test.html.
const GURL url = net::FilePathToFileURL(root_path.Append(
diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc
index 9a7199d..895fd55f 100644
--- a/chrome/browser/chromeos/file_manager/open_with_browser.cc
+++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc
@@ -94,7 +94,7 @@
base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
switches::kPpapiFlashPath));
if (plugin_path.empty())
- PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &plugin_path);
+ base::PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &plugin_path);
return IsPepperPluginEnabled(profile, plugin_path);
}
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
index e55e01da..efe4580 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
@@ -87,7 +87,7 @@
success_(false) {}
void DriveFirstRunTest::SetUpOnMainThread() {
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII(kTestDirectory);
host_resolver()->AddRule("example.com", "127.0.0.1");
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index 1fd028f59..63dc47f1 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -341,7 +341,7 @@
if (!component_ime.path.IsAbsolute()) {
base::FilePath resources_path;
- if (!PathService::Get(chrome::DIR_RESOURCES, &resources_path))
+ if (!base::PathService::Get(chrome::DIR_RESOURCES, &resources_path))
NOTREACHED();
component_ime.path = resources_path.Append(component_ime.path);
}
diff --git a/chrome/browser/chromeos/login/active_directory_login_browsertest.cc b/chrome/browser/chromeos/login/active_directory_login_browsertest.cc
index 2bf07d9..2bb986e6 100644
--- a/chrome/browser/chromeos/login/active_directory_login_browsertest.cc
+++ b/chrome/browser/chromeos/login/active_directory_login_browsertest.cc
@@ -111,7 +111,7 @@
void SetUpInProcessBrowserTestFixture() override {
LoginManagerTest::SetUpInProcessBrowserTestFixture();
base::FilePath user_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
chromeos::RegisterStubPathOverrides(user_data_dir);
DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
std::make_unique<FakeCryptohomeClient>());
diff --git a/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc b/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
index 7305e1a..f004f47 100644
--- a/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
@@ -321,7 +321,7 @@
InitDevicePolicy();
base::FilePath user_data_path;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_path)) {
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_path)) {
ADD_FAILURE() << "Unable to get used data dir";
return false;
}
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
index 8ae0467..0db0930 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
@@ -30,7 +30,7 @@
base::FilePath GetTestDemoAppPath() {
base::FilePath test_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
return test_data_dir.Append(FILE_PATH_LITERAL("chromeos/demo_app"));
}
diff --git a/chrome/browser/chromeos/login/enable_debugging_browsertest.cc b/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
index 1b90b85..1bc64bb 100644
--- a/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
+++ b/chrome/browser/chromeos/login/enable_debugging_browsertest.cc
@@ -376,7 +376,7 @@
local_state_dict.SetBoolean(prefs::kDebuggingFeaturesRequested, true);
base::FilePath user_data_dir;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
base::FilePath local_state_path =
user_data_dir.Append(chrome::kLocalStateFilename);
CHECK(
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index d14dfa2..f7cc1a3 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -1413,7 +1413,7 @@
void SetupFakeDiskMountManagerMountPath(const std::string& mount_path) {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
test_data_dir = test_data_dir.AppendASCII(mount_path);
fake_disk_mount_manager_->set_usb_mount_path(test_data_dir.value());
}
@@ -2269,7 +2269,7 @@
// |private_server| serves crx from test data dir.
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
private_server.ServeFilesFromDirectory(test_data_dir);
ASSERT_TRUE(private_server.InitializeAndListen());
diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc
index 5bf865f..5a1d61d9 100644
--- a/chrome/browser/chromeos/login/login_manager_test.cc
+++ b/chrome/browser/chromeos/login/login_manager_test.cc
@@ -78,7 +78,7 @@
void LoginManagerTest::SetUp() {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
embedded_test_server()->RegisterRequestHandler(
diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc
index 6b52fa7..e0b7467 100644
--- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc
+++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc
@@ -46,7 +46,7 @@
void SetUpOnMainThread() override {
// Load the data pack containing resource_loader.js.
base::FilePath resources_pack_path;
- ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &resources_pack_path));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_MODULE, &resources_pack_path));
resources_pack_path =
resources_pack_path.AppendASCII("gen/ui/login/login_resources.pak");
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
index 0401f58..6ed03fef 100644
--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
@@ -192,7 +192,7 @@
void FakeSamlIdp::SetUp(const std::string& base_path, const GURL& gaia_url) {
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
html_template_dir_ = test_data_dir.Append("login");
login_path_ = base_path;
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 2008547c..3c6043c 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -261,7 +261,7 @@
base::FilePath GetRlzDisabledFlagPath() {
base::FilePath homedir;
- PathService::Get(base::DIR_HOME, &homedir);
+ base::PathService::Get(base::DIR_HOME, &homedir);
return homedir.Append(kRLZDisabledFlagName);
}
#endif
@@ -393,9 +393,9 @@
user_manager->GetPrimaryUser()->username_hash());
// This path has been either created by cryptohome (on real Chrome OS
// device) or by ProfileManager (on chromeos=1 desktop builds).
- PathService::OverrideAndCreateIfNeeded(base::DIR_HOME, homedir,
- true /* path is absolute */,
- false /* don't create */);
+ base::PathService::OverrideAndCreateIfNeeded(base::DIR_HOME, homedir,
+ true /* path is absolute */,
+ false /* don't create */);
}
}
}
diff --git a/chrome/browser/chromeos/login/startup_utils.cc b/chrome/browser/chromeos/login/startup_utils.cc
index 46bbf1c8..a2bfacbe 100644
--- a/chrome/browser/chromeos/login/startup_utils.cc
+++ b/chrome/browser/chromeos/login/startup_utils.cc
@@ -61,7 +61,7 @@
return base::FilePath(kOobeCompleteFlagFilePath);
} else {
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
return user_data_dir.AppendASCII(".oobe_completed");
}
}
diff --git a/chrome/browser/chromeos/login/test/https_forwarder.cc b/chrome/browser/chromeos/login/test/https_forwarder.cc
index ea3a3be..be3d5d0 100644
--- a/chrome/browser/chromeos/login/test/https_forwarder.cc
+++ b/chrome/browser/chromeos/login/test/https_forwarder.cc
@@ -67,7 +67,7 @@
bool ForwardingServer::GetTestServerPath(
base::FilePath* testserver_path) const {
base::FilePath source_root_dir;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &source_root_dir))
+ if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root_dir))
return false;
*testserver_path = source_root_dir.Append("chrome")
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc
index 4efdb2cf..0f114b8 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
@@ -68,7 +68,7 @@
void OobeBaseTest::SetUp() {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
RegisterAdditionalRequestHandlers();
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
index dbb92e8..8737255 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
@@ -155,7 +155,7 @@
std::string profile_image_data;
base::FilePath test_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
EXPECT_TRUE(
ReadFileToString(test_data_dir.Append("chromeos").Append("avatar1.jpg"),
&profile_image_data));
@@ -174,8 +174,8 @@
void SetUpInProcessBrowserTestFixture() override {
LoginManagerTest::SetUpInProcessBrowserTestFixture();
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_));
}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -641,7 +641,7 @@
base::FilePath user_keys_dir;
ASSERT_TRUE(
- PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
+ base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
const std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(cryptohome_id_);
const base::FilePath user_key_file =
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index 352608b..c8470cf 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -491,7 +491,7 @@
}
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
// TODO(crbug.com/670557): Use GetAccountIdKey() instead of user_id().
image_path_ = user_data_dir.AppendASCII(
user_id() + ChooseExtensionFromImageFormat(image_format));
diff --git a/chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc
index d1194685..77bb3bf 100644
--- a/chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc
@@ -149,7 +149,7 @@
std::unique_ptr<policy::UserPolicyBuilder> user_policy_builder(
new policy::UserPolicyBuilder());
base::FilePath user_keys_dir;
- EXPECT_TRUE(PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));
+ EXPECT_TRUE(base::PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));
const std::string sanitized_user_id =
CryptohomeClient::GetStubSanitizedUsername(
cryptohome::Identification(account_id));
@@ -186,7 +186,7 @@
attributes.release());
LoginManagerTest::SetUpInProcessBrowserTestFixture();
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
}
void SetUpCommandLine(base::CommandLine* command_line) override {
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
index f8823ec..1f4cb23e 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
@@ -63,7 +63,7 @@
if (owner_key_util_.get())
return owner_key_util_;
base::FilePath public_key_path;
- if (!PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path))
+ if (!base::PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path))
return NULL;
owner_key_util_ = new ownership::OwnerKeyUtilImpl(public_key_path);
return owner_key_util_;
diff --git a/chrome/browser/chromeos/policy/affiliation_test_helper.cc b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
index bc727c0..33b8883 100644
--- a/chrome/browser/chromeos/policy/affiliation_test_helper.cc
+++ b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
@@ -52,7 +52,8 @@
const AccountId account_id =
AccountId::FromUserEmail(user_policy->policy_data().username());
base::FilePath user_keys_dir;
- ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
+ ASSERT_TRUE(
+ base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
const std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(
cryptohome::Identification(account_id));
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index 2ed36289d..6b26d83 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -104,8 +104,8 @@
install_attributes_ = std::make_unique<chromeos::InstallAttributes>(
chromeos::DBusThreadManager::Get()->GetCryptohomeClient());
base::FilePath install_attrs_file;
- CHECK(PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
- &install_attrs_file));
+ CHECK(base::PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
+ &install_attrs_file));
install_attributes_->Init(install_attrs_file);
}
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
index 40465dc20..d857b0a 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
@@ -80,7 +80,7 @@
std::string* policy_data,
std::string* policy) {
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
ASSERT_TRUE(base::ReadFileToString(
test_data_dir.Append("chromeos").Append(file_name),
policy_data));
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
index c4c7fee..865fe34 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
@@ -313,7 +313,7 @@
static base::FilePath GetTestExtensionSourcePath() {
base::FilePath test_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
return test_data_dir.AppendASCII(kTestExtensionSourceDir);
}
@@ -406,8 +406,9 @@
SetUpInProcessBrowserTestFixture();
signin_policy_provided_disabler_ =
chromeos::GetScopedSigninScreenPolicyProviderDisablerForTesting();
- EXPECT_TRUE(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
- &component_policy_cache_dir_));
+ EXPECT_TRUE(
+ base::PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
+ &component_policy_cache_dir_));
PrepareFakeComponentPolicyResponse();
}
@@ -493,12 +494,14 @@
private:
static void PrefillSigninProfile() {
base::FilePath profile_source_path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &profile_source_path));
+ EXPECT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, &profile_source_path));
profile_source_path = profile_source_path.AppendASCII(kFakeProfileSourceDir)
.AppendASCII(chrome::kInitialProfile);
base::FilePath profile_target_path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &profile_target_path));
+ EXPECT_TRUE(
+ base::PathService::Get(chrome::DIR_USER_DATA, &profile_target_path));
EXPECT_TRUE(
base::CopyDirectory(profile_source_path, profile_target_path, true));
@@ -514,12 +517,12 @@
void PrefillComponentPolicyCache() {
base::FilePath user_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
chromeos::RegisterStubPathOverrides(user_data_dir);
base::FilePath cache_dir;
- EXPECT_TRUE(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
- &cache_dir));
+ EXPECT_TRUE(base::PathService::Get(
+ chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY, &cache_dir));
ResourceCache cache(cache_dir, new base::NullTaskRunner);
EXPECT_TRUE(cache.Store(kPolicyProtoCacheKey, kTestExtensionId,
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index 19bfa38..d6d48e0 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -251,8 +251,8 @@
// exposing policy for extensions.
if (!component_policy_disabled_for_testing_) {
base::FilePath component_policy_cache_dir;
- CHECK(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
- &component_policy_cache_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
+ &component_policy_cache_dir));
CHECK(signin_profile_forwarding_schema_registry_);
CreateComponentCloudPolicyService(
dm_protocol::kChromeSigninExtensionPolicyType,
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 17fc39c..2e54360 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -632,8 +632,8 @@
base::FilePath GetExtensionCacheDirectoryForAccountID(
const std::string& account_id) {
base::FilePath extension_cache_root_dir;
- if (!PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
- &extension_cache_root_dir)) {
+ if (!base::PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
+ &extension_cache_root_dir)) {
ADD_FAILURE();
}
return extension_cache_root_dir.Append(
@@ -1127,7 +1127,7 @@
// Verify that the app was downloaded to the account's extension cache.
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
EXPECT_TRUE(ContentsEqual(
GetCacheCRXFile(kAccountId1, kHostedAppID, kHostedAppVersion),
test_dir.Append(kHostedAppCRXPath)));
@@ -1154,7 +1154,7 @@
EXPECT_TRUE(base::CreateDirectory(
GetExtensionCacheDirectoryForAccountID(kAccountId1)));
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
const base::FilePath cached_hosted_app =
GetCacheCRXFile(kAccountId1, kHostedAppID, kHostedAppVersion);
EXPECT_TRUE(CopyFile(test_dir.Append(kHostedAppCRXPath),
@@ -1279,7 +1279,7 @@
GetCacheCRXFilePath(kGoodExtensionID, kGoodExtensionVersion, temp_path);
base::FilePath test_dir;
std::string hash;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
EXPECT_TRUE(CopyFile(test_dir.Append(kGoodExtensionCRXPath), temp_file));
cache_impl.AllowCaching(kGoodExtensionID);
run_loop.reset(new base::RunLoop);
@@ -1437,7 +1437,7 @@
WaitForPolicy();
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
std::string image_data;
ASSERT_TRUE(base::ReadFileToString(
test_dir.Append(chromeos::test::kUserAvatarImage1RelativePath),
@@ -1479,7 +1479,7 @@
ASSERT_TRUE(user);
base::FilePath user_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
const base::FilePath saved_image_path =
user_data_dir.Append(account_id_1_.GetUserEmail()).AddExtension("jpg");
@@ -1547,7 +1547,7 @@
extensions::NOTIFICATION_CRX_INSTALLER_DONE,
content::NotificationService::AllSources());
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath));
app_install_observer.Wait();
const extensions::Extension* app =
@@ -2439,7 +2439,7 @@
// The Terms of Service URL was valid. Verify that the screen is showing the
// downloaded Terms of Service and the accept button is enabled.
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
std::string terms_of_service;
ASSERT_TRUE(base::ReadFileToString(
test_dir.Append(kExistentTermsOfServicePath), &terms_of_service));
diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_service.cc b/chrome/browser/chromeos/policy/device_local_account_external_data_service.cc
index 92eb02e..1a46366 100644
--- a/chrome/browser/chromeos/policy/device_local_account_external_data_service.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_external_data_service.cc
@@ -27,8 +27,8 @@
backend_task_runner_(backend_task_runner),
io_task_runner_(io_task_runner) {
base::FilePath cache_dir;
- CHECK(PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA,
- &cache_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA,
+ &cache_dir));
resource_cache_.reset(new ResourceCache(cache_dir, backend_task_runner));
parent_->AddObserver(this);
}
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
index ca56b213..d7fa050 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
@@ -115,8 +115,8 @@
// the removal is in progress.
void DeleteObsoleteExtensionCache(const std::string& account_id_to_delete) {
base::FilePath cache_root_dir;
- CHECK(PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
- &cache_root_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
+ &cache_root_dir));
const base::FilePath path = cache_root_dir.Append(
GetCacheSubdirectoryForAccountID(account_id_to_delete));
if (base::DirectoryExists(path))
@@ -151,8 +151,8 @@
account, store_.get(), &schema_registry_));
}
base::FilePath cache_root_dir;
- CHECK(PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
- &cache_root_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
+ &cache_root_dir));
extension_loader_ = new chromeos::DeviceLocalAccountExternalPolicyLoader(
store_.get(),
cache_root_dir.Append(
@@ -289,8 +289,9 @@
&DeviceLocalAccountPolicyService::UpdateAccountListIfNonePending,
base::Unretained(this)))),
weak_factory_(this) {
- CHECK(PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY,
- &component_policy_cache_root_));
+ CHECK(base::PathService::Get(
+ chromeos::DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY,
+ &component_policy_cache_root_));
external_data_service_.reset(new DeviceLocalAccountExternalDataService(
this,
external_data_service_backend_task_runner,
@@ -517,8 +518,8 @@
orphan_extension_cache_deletion_state_ = IN_PROGRESS;
base::FilePath cache_root_dir;
- CHECK(PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
- &cache_root_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
+ &cache_root_dir));
extension_cache_task_runner_->PostTaskAndReply(
FROM_HERE,
base::BindOnce(&DeleteOrphanedCaches, cache_root_dir,
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 845d0803..592d6bd 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -546,7 +546,7 @@
// the caches for all existing accounts are running.
TEST_F(DeviceLocalAccountPolicyExtensionCacheTest, Startup) {
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
const base::FilePath source_crx_file =
test_data_dir.Append(kExtensionCRXPath);
const std::string target_crx_file_name =
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
index 7ce2cfa2..2156bb7f 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
@@ -33,8 +33,8 @@
void WriteInstallAttributesFile(const std::string& install_attrs_blob) {
base::FilePath install_attrs_file;
- ASSERT_TRUE(
- PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES, &install_attrs_file));
+ ASSERT_TRUE(base::PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
+ &install_attrs_file));
ASSERT_EQ(base::checked_cast<int>(install_attrs_blob.size()),
base::WriteFile(install_attrs_file, install_attrs_blob.c_str(),
install_attrs_blob.size()));
@@ -72,7 +72,8 @@
OverridePaths();
base::FilePath owner_key_file;
- ASSERT_TRUE(PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_file));
+ ASSERT_TRUE(
+ base::PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_file));
std::string owner_key_bits = device_policy()->GetPublicSigningKeyAsString();
ASSERT_FALSE(owner_key_bits.empty());
ASSERT_EQ(base::checked_cast<int>(owner_key_bits.length()),
@@ -86,7 +87,7 @@
// use the overridden paths before ChromeBrowserMain starts. Make sure that
// the paths are overridden before using them.
base::FilePath user_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
chromeos::RegisterStubPathOverrides(user_data_dir);
}
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index d34ae538..40b990c5 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -207,7 +207,8 @@
void PowerPolicyBrowserTestBase::InstallUserKey() {
base::FilePath user_keys_dir;
- ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
+ ASSERT_TRUE(
+ base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(
cryptohome::Identification(user_manager::StubAccountId()));
diff --git a/chrome/browser/chromeos/policy/pre_signin_policy_fetcher.cc b/chrome/browser/chromeos/policy/pre_signin_policy_fetcher.cc
index 5fbc62bd..e824d918 100644
--- a/chrome/browser/chromeos/policy/pre_signin_policy_fetcher.cc
+++ b/chrome/browser/chromeos/policy/pre_signin_policy_fetcher.cc
@@ -110,7 +110,8 @@
// are not signed).
if (!policy_blob.empty() && !is_active_directory_managed_) {
base::FilePath policy_key_dir;
- CHECK(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &policy_key_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS,
+ &policy_key_dir));
cached_policy_key_loader_ = std::make_unique<CachedPolicyKeyLoaderChromeOS>(
cryptohome_client_, task_runner_, account_id_, policy_key_dir);
cached_policy_key_loader_->EnsurePolicyKeyLoaded(base::Bind(
diff --git a/chrome/browser/chromeos/policy/pre_signin_policy_fetcher_unittest.cc b/chrome/browser/chromeos/policy/pre_signin_policy_fetcher_unittest.cc
index 0b93415..768cafe 100644
--- a/chrome/browser/chromeos/policy/pre_signin_policy_fetcher_unittest.cc
+++ b/chrome/browser/chromeos/policy/pre_signin_policy_fetcher_unittest.cc
@@ -63,8 +63,8 @@
// are shared between session_manager and chrome through files) and set it
// into PathService, so PreSigninPolicyFetcher will use it.
ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
- PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
- user_policy_keys_dir());
+ base::PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
+ user_policy_keys_dir());
auto cloud_policy_client = std::make_unique<MockCloudPolicyClient>();
cloud_policy_client_ = cloud_policy_client.get();
diff --git a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc
index bedf27d..2edefe79 100644
--- a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc
@@ -59,7 +59,7 @@
embedded_test_server()->GetURL(std::string("/") + kExternalDataPath);
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
ASSERT_TRUE(base::ReadFileToString(test_dir.AppendASCII(kExternalDataPath),
&external_data_));
ASSERT_FALSE(external_data_.empty());
diff --git a/chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.cc
index 2a700eb..32168051 100644
--- a/chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.cc
@@ -358,7 +358,8 @@
const base::FilePath external_data_dir =
profile_dir.Append(kPolicy).Append(kPolicyExternalDataDir);
base::FilePath policy_key_dir;
- CHECK(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &policy_key_dir));
+ CHECK(
+ base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &policy_key_dir));
std::unique_ptr<UserCloudPolicyStoreChromeOS> store =
std::make_unique<UserCloudPolicyStoreChromeOS>(
diff --git a/chrome/browser/chromeos/settings/install_attributes_unittest.cc b/chrome/browser/chromeos/settings/install_attributes_unittest.cc
index c466e39..d632356 100644
--- a/chrome/browser/chromeos/settings/install_attributes_unittest.cc
+++ b/chrome/browser/chromeos/settings/install_attributes_unittest.cc
@@ -48,7 +48,7 @@
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
FILE_INSTALL_ATTRIBUTES, GetTempPath(), true, false));
DBusThreadManager::Initialize();
install_attributes_ = std::make_unique<InstallAttributes>(
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
index f1082d51..fb4786d 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
@@ -75,10 +75,10 @@
AutomaticRebootManager::SystemEventTimes GetSystemEventTimes() {
base::FilePath uptime_file;
- CHECK(PathService::Get(chromeos::FILE_UPTIME, &uptime_file));
+ CHECK(base::PathService::Get(chromeos::FILE_UPTIME, &uptime_file));
base::FilePath update_reboot_needed_uptime_file;
- CHECK(PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
- &update_reboot_needed_uptime_file));
+ CHECK(base::PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
+ &update_reboot_needed_uptime_file));
return AutomaticRebootManager::SystemEventTimes(
ReadTimeDeltaFromFile(uptime_file),
ReadTimeDeltaFromFile(update_reboot_needed_uptime_file));
@@ -89,15 +89,15 @@
const base::TimeDelta kZeroTimeDelta;
base::FilePath update_reboot_needed_uptime_file;
- CHECK(PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
- &update_reboot_needed_uptime_file));
+ CHECK(base::PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
+ &update_reboot_needed_uptime_file));
const base::TimeDelta last_update_reboot_needed_uptime =
ReadTimeDeltaFromFile(update_reboot_needed_uptime_file);
if (last_update_reboot_needed_uptime != kZeroTimeDelta)
return;
base::FilePath uptime_file;
- CHECK(PathService::Get(chromeos::FILE_UPTIME, &uptime_file));
+ CHECK(base::PathService::Get(chromeos::FILE_UPTIME, &uptime_file));
const base::TimeDelta uptime = ReadTimeDeltaFromFile(uptime_file);
if (uptime == kZeroTimeDelta)
return;
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
index 59bde8d..8874962 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -319,9 +319,10 @@
update_reboot_needed_uptime_file_ =
temp_dir.Append("update_reboot_needed_uptime");
ASSERT_EQ(0, base::WriteFile(update_reboot_needed_uptime_file_, NULL, 0));
- ASSERT_TRUE(PathService::Override(chromeos::FILE_UPTIME, uptime_file));
- ASSERT_TRUE(PathService::Override(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
- update_reboot_needed_uptime_file_));
+ ASSERT_TRUE(base::PathService::Override(chromeos::FILE_UPTIME, uptime_file));
+ ASSERT_TRUE(
+ base::PathService::Override(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,
+ update_reboot_needed_uptime_file_));
TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
AutomaticRebootManager::RegisterPrefs(local_state_.registry());
diff --git a/chrome/browser/chromeos/tpm_firmware_update.cc b/chrome/browser/chromeos/tpm_firmware_update.cc
index 8048088..a547e231 100644
--- a/chrome/browser/chromeos/tpm_firmware_update.cc
+++ b/chrome/browser/chromeos/tpm_firmware_update.cc
@@ -102,8 +102,9 @@
private:
static base::FilePath GetUpdateLocationFilePath() {
base::FilePath update_location_file;
- CHECK(PathService::Get(chrome::FILE_CHROME_OS_TPM_FIRMWARE_UPDATE_LOCATION,
- &update_location_file));
+ CHECK(base::PathService::Get(
+ chrome::FILE_CHROME_OS_TPM_FIRMWARE_UPDATE_LOCATION,
+ &update_location_file));
return update_location_file;
}
diff --git a/chrome/browser/chromeos/tpm_firmware_update_unittest.cc b/chrome/browser/chromeos/tpm_firmware_update_unittest.cc
index 3f025359..e4bc226 100644
--- a/chrome/browser/chromeos/tpm_firmware_update_unittest.cc
+++ b/chrome/browser/chromeos/tpm_firmware_update_unittest.cc
@@ -67,9 +67,9 @@
void SetUpdateAvailability(Availability availability) {
base::FilePath update_location_path;
- ASSERT_TRUE(
- PathService::Get(chrome::FILE_CHROME_OS_TPM_FIRMWARE_UPDATE_LOCATION,
- &update_location_path));
+ ASSERT_TRUE(base::PathService::Get(
+ chrome::FILE_CHROME_OS_TPM_FIRMWARE_UPDATE_LOCATION,
+ &update_location_path));
switch (availability) {
case Availability::kPending:
base::DeleteFile(update_location_path, false);
diff --git a/chrome/browser/component_updater/component_installers_unittest.cc b/chrome/browser/component_updater/component_installers_unittest.cc
index d410325..b4da7ec 100644
--- a/chrome/browser/component_updater/component_installers_unittest.cc
+++ b/chrome/browser/component_updater/component_installers_unittest.cc
@@ -69,7 +69,7 @@
// The test directory is chrome/test/data/components/flapper.
base::FilePath manifest;
- PathService::Get(chrome::DIR_TEST_DATA, &manifest);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &manifest);
manifest = manifest.Append(kDataPath);
manifest = manifest.AppendASCII("manifest.json");
diff --git a/chrome/browser/component_updater/component_patcher_operation_browsertest.cc b/chrome/browser/component_updater/component_patcher_operation_browsertest.cc
index 0ae45282..38bf0ad 100644
--- a/chrome/browser/component_updater/component_patcher_operation_browsertest.cc
+++ b/chrome/browser/component_updater/component_patcher_operation_browsertest.cc
@@ -43,7 +43,7 @@
static base::FilePath TestFile(const char* name) {
base::FilePath path;
- PathService::Get(base::DIR_SOURCE_ROOT, &path);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
return path.AppendASCII("components")
.AppendASCII("test")
.AppendASCII("data")
diff --git a/chrome/browser/component_updater/cros_component_installer.cc b/chrome/browser/component_updater/cros_component_installer.cc
index f59e4cb..6141be51 100644
--- a/chrome/browser/component_updater/cros_component_installer.cc
+++ b/chrome/browser/component_updater/cros_component_installer.cc
@@ -64,7 +64,7 @@
void CleanUpOldInstalls(const std::string& name) {
// Clean up components installed at old path.
base::FilePath path;
- if (!PathService::Get(DIR_COMPONENT_USER, &path))
+ if (!base::PathService::Get(DIR_COMPONENT_USER, &path))
return;
path = path.Append(name);
if (base::PathExists(path))
@@ -75,7 +75,7 @@
std::vector<ComponentConfig> GetInstalled() {
std::vector<ComponentConfig> configs;
base::FilePath root;
- if (!PathService::Get(DIR_COMPONENT_USER, &root))
+ if (!base::PathService::Get(DIR_COMPONENT_USER, &root))
return configs;
root = root.Append(kComponentsRootPath);
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 191b880..edfa283 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -202,7 +202,8 @@
content::WebPluginInfo web_plugin = plugin_info.ToWebPluginInfo();
base::FilePath system_flash_path;
- PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN, &system_flash_path);
+ base::PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+ &system_flash_path);
std::vector<content::WebPluginInfo> plugins;
PluginService::GetInstance()->GetInternalPlugins(&plugins);
@@ -237,7 +238,7 @@
}
void UpdatePathService(const base::FilePath& path) {
- PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
+ base::PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
}
#endif // !defined(OS_LINUX) && defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc
index 7d7af54..b1a1774 100644
--- a/chrome/browser/component_updater/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -92,7 +92,8 @@
// Tell the rest of the world where to find the platform-specific PNaCl files.
void OverrideDirPnaclComponent(const base::FilePath& base_path) {
- PathService::Override(chrome::DIR_PNACL_COMPONENT, GetPlatformDir(base_path));
+ base::PathService::Override(chrome::DIR_PNACL_COMPONENT,
+ GetPlatformDir(base_path));
}
base::DictionaryValue* ReadJSONManifest(const base::FilePath& manifest_path) {
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index ff540f7..61b0023 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -426,7 +426,7 @@
// Passed the basic tests. Copy the installation to a permanent directory.
base::FilePath path;
- if (!PathService::Get(DIR_RECOVERY_BASE, &path))
+ if (!base::PathService::Get(DIR_RECOVERY_BASE, &path))
return false;
if (!base::PathExists(path) && !base::CreateDirectory(path))
return false;
diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
index abeebe8..5bb043fb 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
@@ -113,7 +113,8 @@
base::FilePath GetSanitizedWhitelistPath(const std::string& crx_id) {
base::FilePath base_dir;
- PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, &base_dir);
+ base::PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,
+ &base_dir);
return base_dir.empty()
? base::FilePath()
: base_dir.AppendASCII(crx_id + kSanitizedWhitelistExtension);
@@ -187,7 +188,7 @@
void RemoveUnregisteredWhitelistsOnTaskRunner(
const std::set<std::string>& registered_whitelists) {
base::FilePath base_dir;
- PathService::Get(DIR_SUPERVISED_USER_WHITELISTS, &base_dir);
+ base::PathService::Get(DIR_SUPERVISED_USER_WHITELISTS, &base_dir);
if (!base_dir.empty()) {
base::FileEnumerator file_enumerator(base_dir, false,
base::FileEnumerator::DIRECTORIES);
@@ -210,7 +211,8 @@
}
}
- PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, &base_dir);
+ base::PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,
+ &base_dir);
if (!base_dir.empty()) {
base::FilePath pattern(FILE_PATH_LITERAL("*"));
pattern = pattern.AppendASCII(kSanitizedWhitelistExtension);
diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc
index 0e6d66f..be5ea57 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.cc
@@ -219,14 +219,14 @@
profile_attributes_storage(),
&local_state_);
- ASSERT_TRUE(PathService::Get(DIR_SUPERVISED_USER_WHITELISTS,
- &whitelist_base_directory_));
+ ASSERT_TRUE(base::PathService::Get(DIR_SUPERVISED_USER_WHITELISTS,
+ &whitelist_base_directory_));
whitelist_directory_ = whitelist_base_directory_.AppendASCII(kCrxId);
whitelist_version_directory_ = whitelist_directory_.AppendASCII(kVersion);
ASSERT_TRUE(
- PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,
- &installed_whitelist_directory_));
+ base::PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,
+ &installed_whitelist_directory_));
std::string crx_id(kCrxId);
whitelist_path_ =
installed_whitelist_directory_.AppendASCII(crx_id + ".json");
diff --git a/chrome/browser/crash_upload_list/crash_upload_list.cc b/chrome/browser/crash_upload_list/crash_upload_list.cc
index c6345fb..c1bbfc7 100644
--- a/chrome/browser/crash_upload_list/crash_upload_list.cc
+++ b/chrome/browser/crash_upload_list/crash_upload_list.cc
@@ -25,7 +25,7 @@
return new CrashUploadListCrashpad();
#else
base::FilePath crash_dir_path;
- PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
+ base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
base::FilePath upload_log_path =
crash_dir_path.AppendASCII(CrashUploadList::kReporterLogFilename);
#if defined(OS_ANDROID)
diff --git a/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc b/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc
index f071144..c3be1b6 100644
--- a/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc
+++ b/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc
@@ -44,7 +44,7 @@
TEST_F(DevToolsFileSystemIndexerTest, BasicUsage) {
base::FilePath base_test_path;
- PathService::Get(chrome::DIR_TEST_DATA, &base_test_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &base_test_path);
base::FilePath index_path =
base_test_path.Append(FILE_PATH_LITERAL("devtools"))
.Append(FILE_PATH_LITERAL("indexer"));
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 8960b3f9..955f501d 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -486,7 +486,7 @@
public content::NotificationObserver {
public:
DevToolsExtensionTest() : DevToolsSanityTest() {
- PathService::Get(chrome::DIR_TEST_DATA, &test_extensions_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_extensions_dir_);
test_extensions_dir_ = test_extensions_dir_.AppendASCII("devtools");
test_extensions_dir_ = test_extensions_dir_.AppendASCII("extensions");
}
@@ -1933,7 +1933,7 @@
command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort, "9222");
// Override the extension root path.
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("devtools");
}
};
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 7a6bf06..0f48441 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -103,13 +103,13 @@
// The client requested an ephemeral port. Must write the selected
// port to a well-known location in the profile directory to
// bootstrap the connection process.
- bool result = PathService::Get(chrome::DIR_USER_DATA, &output_dir);
+ bool result = base::PathService::Get(chrome::DIR_USER_DATA, &output_dir);
DCHECK(result);
}
base::FilePath debug_frontend_dir;
#if BUILDFLAG(DEBUG_DEVTOOLS)
- PathService::Get(chrome::DIR_INSPECTOR_DEBUG, &debug_frontend_dir);
+ base::PathService::Get(chrome::DIR_INSPECTOR_DEBUG, &debug_frontend_dir);
#endif
content::DevToolsAgentHost::StartRemoteDebuggingServer(
diff --git a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
index d004fb35..999f600a 100644
--- a/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
+++ b/chrome/browser/diagnostics/diagnostics_controller_unittest.cc
@@ -37,7 +37,7 @@
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath test_data;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data);
test_data = test_data.Append(FILE_PATH_LITERAL("diagnostics"));
test_data = test_data.Append(FILE_PATH_LITERAL("user"));
base::CopyDirectory(test_data, temp_dir_.GetPath(), true);
@@ -47,8 +47,8 @@
// Redirect the home dir to the profile directory. We have to do this
// because NSS uses the HOME directory to find where to store it's database,
// so that's where the diagnostics and recovery code looks for it.
- PathService::Get(base::DIR_HOME, &old_home_dir_);
- PathService::Override(base::DIR_HOME, profile_dir_);
+ base::PathService::Get(base::DIR_HOME, &old_home_dir_);
+ base::PathService::Override(base::DIR_HOME, profile_dir_);
#endif
cmdline_ = base::CommandLine(base::CommandLine::NO_PROGRAM);
@@ -63,7 +63,7 @@
void TearDown() override {
DiagnosticsController::GetInstance()->ClearResults();
#if defined(OS_CHROMEOS)
- PathService::Override(base::DIR_HOME, old_home_dir_);
+ base::PathService::Override(base::DIR_HOME, old_home_dir_);
old_home_dir_.clear();
#endif
}
diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc
index 320113a..2dd4315 100644
--- a/chrome/browser/diagnostics/diagnostics_model.cc
+++ b/chrome/browser/diagnostics/diagnostics_model.cc
@@ -234,7 +234,7 @@
base::FilePath user_data_dir =
cmdline.GetSwitchValuePath(switches::kUserDataDir);
if (!user_data_dir.empty())
- PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
+ base::PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
#if defined(OS_WIN)
return new DiagnosticsModelWin();
#elif defined(OS_MACOSX)
diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc
index da7cc784..9334eb1 100644
--- a/chrome/browser/diagnostics/diagnostics_test.cc
+++ b/chrome/browser/diagnostics/diagnostics_test.cc
@@ -77,7 +77,7 @@
// static
base::FilePath DiagnosticsTest::GetUserDefaultProfileDir() {
base::FilePath path;
- if (!PathService::Get(chrome::DIR_USER_DATA, &path))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &path))
return base::FilePath();
return path.AppendASCII(chrome::kInitialProfile);
}
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index 61b9db92..ebbd221 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -59,7 +59,7 @@
bool ExecuteImpl(DiagnosticsModel::Observer* observer) override {
base::FilePath data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &data_dir))
return false;
int64_t disk_space = base::SysInfo::AmountOfFreeDiskSpace(data_dir);
if (disk_space < 0) {
@@ -232,7 +232,7 @@
return false;
}
base::FilePath dir_or_file;
- if (!PathService::Get(path_info_.path_id, &dir_or_file)) {
+ if (!base::PathService::Get(path_info_.path_id, &dir_or_file)) {
RecordStopFailure(DIAG_RECON_PATH_PROVIDER, "Path provider failure");
return false;
}
@@ -329,7 +329,7 @@
std::unique_ptr<DiagnosticsTest> MakeLocalStateTest() {
base::FilePath path;
- PathService::Get(chrome::DIR_USER_DATA, &path);
+ base::PathService::Get(chrome::DIR_USER_DATA, &path);
path = path.Append(chrome::kLocalStateFilename);
return std::make_unique<JSONTest>(path, DIAGNOSTICS_JSON_LOCAL_STATE_TEST,
50 * kOneKilobyte, JSONTest::CRITICAL);
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 8b88e9c..e49200b 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -232,7 +232,7 @@
#if defined(OS_CHROMEOS)
std::unique_ptr<DiagnosticsTest> MakeSqliteNssCertDbTest() {
base::FilePath home_dir;
- PathService::Get(base::DIR_HOME, &home_dir);
+ base::PathService::Get(base::DIR_HOME, &home_dir);
return std::make_unique<SqliteIntegrityTest>(
SqliteIntegrityTest::REMOVE_IF_CORRUPT,
DIAGNOSTICS_SQLITE_INTEGRITY_NSS_CERT_TEST,
@@ -241,7 +241,7 @@
std::unique_ptr<DiagnosticsTest> MakeSqliteNssKeyDbTest() {
base::FilePath home_dir;
- PathService::Get(base::DIR_HOME, &home_dir);
+ base::PathService::Get(base::DIR_HOME, &home_dir);
return std::make_unique<SqliteIntegrityTest>(
SqliteIntegrityTest::REMOVE_IF_CORRUPT,
DIAGNOSTICS_SQLITE_INTEGRITY_NSS_KEY_TEST,
diff --git a/chrome/browser/downgrade/user_data_downgrade.cc b/chrome/browser/downgrade/user_data_downgrade.cc
index c4cd1b7..9643ecb 100644
--- a/chrome/browser/downgrade/user_data_downgrade.cc
+++ b/chrome/browser/downgrade/user_data_downgrade.cc
@@ -118,7 +118,7 @@
void MoveUserDataForFirstRunAfterDowngrade() {
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return;
InstallLevel install_level = GetInstallLevel();
base::Version current_version(chrome::kChromeVersion);
@@ -162,7 +162,7 @@
void DeleteMovedUserDataSoon() {
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
content::BrowserThread::PostAfterStartupTask(
FROM_HERE,
base::CreateTaskRunnerWithTraits(
diff --git a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
index 834f197b..f6f432c 100644
--- a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
+++ b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
@@ -34,7 +34,7 @@
// InProcessBrowserTest:
bool SetUpUserDataDirectory() override {
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_))
return false;
if (!CreateTemporaryFileInDir(user_data_dir_, &other_file_))
return false;
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index 7197867..d746ade 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -377,7 +377,7 @@
base::FilePath ChromeDownloadManagerDelegateTest::GetDefaultDownloadPath()
const {
base::FilePath path;
- CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path));
+ CHECK(base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path));
return path;
}
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index b9fed5a..dbb251e 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -468,7 +468,8 @@
// Returning false indicates a failure of the setup, and should be asserted
// in the caller.
bool InitialSetup() {
- bool have_test_dir = PathService::Get(chrome::DIR_TEST_DATA, &test_dir_);
+ bool have_test_dir =
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir_);
EXPECT_TRUE(have_test_dir);
if (!have_test_dir)
return false;
@@ -498,7 +499,7 @@
base::FilePath GetTestDataDirectory() {
base::FilePath test_file_directory;
- PathService::Get(chrome::DIR_TEST_DATA, &test_file_directory);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_file_directory);
return test_file_directory;
}
@@ -959,8 +960,8 @@
// If it's not where we asked it to be, it should be in the
// My Documents folder.
base::FilePath my_docs_folder;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DOCUMENTS,
- &my_docs_folder));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DOCUMENTS,
+ &my_docs_folder));
EXPECT_EQ(0u,
my_downloaded_file.value().find(my_docs_folder.value()));
}
diff --git a/chrome/browser/download/download_path_reservation_tracker.cc b/chrome/browser/download/download_path_reservation_tracker.cc
index 71494aad..18b9b78 100644
--- a/chrome/browser/download/download_path_reservation_tracker.cc
+++ b/chrome/browser/download/download_path_reservation_tracker.cc
@@ -181,7 +181,7 @@
if (!base::PathIsWritable(target_path->DirName())) {
DVLOG(1) << "Unable to write to path \"" << target_path->value() << "\"";
base::FilePath target_dir;
- PathService::Get(chrome::DIR_USER_DOCUMENTS, &target_dir);
+ base::PathService::Get(chrome::DIR_USER_DOCUMENTS, &target_dir);
*target_path = target_dir.Append(target_path->BaseName());
return PathValidationResult::PATH_NOT_WRITABLE;
}
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index d9f9fe5..1387228 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -74,7 +74,7 @@
return false;
#else
base::FilePath desktop_dir;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop_dir)) {
+ if (!base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_dir)) {
NOTREACHED();
return false;
}
@@ -90,13 +90,13 @@
friend struct base::LazyInstanceTraitsBase<DefaultDownloadDirectory>;
DefaultDownloadDirectory() {
- if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path_)) {
+ if (!base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path_)) {
NOTREACHED();
}
if (DownloadPathIsDangerous(path_)) {
// This is only useful on platforms that support
// DIR_DEFAULT_DOWNLOADS_SAFE.
- if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS_SAFE, &path_)) {
+ if (!base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS_SAFE, &path_)) {
NOTREACHED();
}
}
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
index 8d528aa..94497fb 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -289,7 +289,7 @@
base::FilePath test_download_dir() const {
base::FilePath path;
- CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path));
+ CHECK(base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &path));
return path;
}
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 981c0f34..6323683 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -292,7 +292,7 @@
content::SetupCrossSiteRedirector(embedded_test_server());
embedded_test_server()->StartAcceptingConnections();
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
InProcessBrowserTest::SetUp();
}
@@ -1187,7 +1187,7 @@
IN_PROC_BROWSER_TEST_P(SavePageOriginalVsSavedComparisonTest,
ObjectElementsViaFile) {
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
GURL url(net::FilePathToFileURL(
test_data_dir.Append(FILE_PATH_LITERAL("save_page/frames-objects.htm"))));
EXPECT_TRUE(url.SchemeIsFile());
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index 2c75475..3d50db2f 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -61,7 +61,7 @@
void StartEmbeddedTestServer() {
base::FilePath test_data;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data));
embedded_test_server()->ServeFilesFromDirectory(
test_data.AppendASCII("extensions/api_test")
.AppendASCII(kSitesDir));
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index a3b5d74..f092d09 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -90,7 +90,7 @@
base::i18n::ReplaceIllegalCharactersInPath(&filename, '_');
base::FilePath default_path;
- PathService::Get(chrome::DIR_USER_DOCUMENTS, &default_path);
+ base::PathService::Get(chrome::DIR_USER_DOCUMENTS, &default_path);
return default_path.Append(filename);
}
diff --git a/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_apitest.cc
index 02a65d4..bdd6e19b 100644
--- a/chrome/browser/extensions/api/debugger/debugger_apitest.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_apitest.cc
@@ -164,7 +164,7 @@
DebuggerNotAllowedOnOtherExtensionPages) {
// Load another arbitrary extension with an associated resource (popup.html).
base::FilePath path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &path));
path = path.AppendASCII("extensions").AppendASCII("simple_with_popup");
const Extension* another_extension = LoadExtension(path);
ASSERT_TRUE(another_extension);
diff --git a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
index 13840d1..b11b31b 100644
--- a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
+++ b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
@@ -120,7 +120,7 @@
ExtensionBrowserTest::SetUpOnMainThread();
base::FilePath test_root_path;
- PathService::Get(chrome::DIR_TEST_DATA, &test_root_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_root_path);
test_root_path = test_root_path.AppendASCII("extensions")
.AppendASCII("declarative_net_request");
embedded_test_server()->ServeFilesFromDirectory(test_root_path);
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
index c6c75b4..66e3efd 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -254,7 +254,7 @@
IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, DISABLED_Delegation) {
// Initialize test server.
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data));
embedded_test_server()->ServeFilesFromDirectory(test_data.AppendASCII(
"extensions/api_test/desktop_capture_delegate"));
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc b/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
index aaa7aced..570844d 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
@@ -34,7 +34,7 @@
// Tests opening the developer tools for an app window.
IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, InspectAppWindowView) {
base::FilePath dir;
- PathService::Get(chrome::DIR_TEST_DATA, &dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &dir);
dir = dir.AppendASCII("extensions")
.AppendASCII("platform_apps")
.AppendASCII("minimal");
@@ -85,7 +85,7 @@
IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, InspectEmbeddedOptionsPage) {
base::FilePath dir;
- PathService::Get(chrome::DIR_TEST_DATA, &dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &dir);
// Load an extension that only has an embedded options_ui page.
const Extension* extension = LoadExtension(dir.AppendASCII("extensions")
.AppendASCII("delayed_install")
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
index 99964e18..5d0ccc2 100644
--- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
+++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
@@ -230,7 +230,7 @@
base::FilePath ChromeFileSystemDelegate::GetDefaultDirectory() {
base::FilePath documents_dir;
- PathService::Get(chrome::DIR_USER_DOCUMENTS, &documents_dir);
+ base::PathService::Get(chrome::DIR_USER_DOCUMENTS, &documents_dir);
return documents_dir;
}
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
index 50a2b82..fe2b33b 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -163,7 +163,7 @@
IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiGetDisplayPathPrettify) {
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
base::DIR_HOME, test_root_folder_, false, false));
}
@@ -230,7 +230,7 @@
ASSERT_FALSE(test_file.empty());
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
FileSystemChooseEntryFunction::
@@ -254,7 +254,7 @@
ASSERT_FALSE(test_file.empty());
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
FileSystemChooseEntryFunction::
@@ -269,7 +269,7 @@
ASSERT_FALSE(test_file.empty());
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
FileSystemChooseEntryFunction::SkipPickerAndSelectSuggestedPathForTest();
@@ -351,7 +351,7 @@
base::FilePath test_directory = test_file.DirName();
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
@@ -369,7 +369,7 @@
base::FilePath test_directory = test_file.DirName();
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
@@ -388,7 +388,7 @@
base::FilePath parent_directory = test_directory.DirName();
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
@@ -410,7 +410,7 @@
base::FilePath parent_directory = test_directory.DirName();
{
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, parent_directory, false, false));
}
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index 9fa91d2..183e3cad 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -299,7 +299,7 @@
FileSystemApiOpenMultipleSuggested) {
base::FilePath test_file = drive::util::GetDriveMountPointPath(
browser()->profile()).AppendASCII("root/open_existing.txt");
- ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
+ ASSERT_TRUE(base::PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), true, false));
FileSystemChooseEntryFunction::SkipPickerAndSelectSuggestedPathForTest();
ASSERT_TRUE(RunPlatformAppTest(
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index 39bdf5e..95796a2 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -254,7 +254,7 @@
void SetUpOnMainThread() override {
MediaGalleriesPlatformAppBrowserTest::SetUpOnMainThread();
- ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_));
app_dir_ = app_dir_.AppendASCII("ppapi")
.AppendASCII("tests")
.AppendASCII("extensions")
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
index 4067196..1acf4ae 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
@@ -74,7 +74,8 @@
ScopedTestNativeMessagingHost test_host;
base::FilePath test_user_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_user_data_dir));
+ ASSERT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_user_data_dir));
test_user_data_dir = test_user_data_dir.AppendASCII("native_messaging")
.AppendASCII("native_hosts");
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
index 0a5d016..c084362 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
@@ -22,7 +22,7 @@
base::FilePath FindManifestInDir(int dir_key, const std::string& host_name) {
base::FilePath base_path;
- if (PathService::Get(dir_key, &base_path)) {
+ if (base::PathService::Get(dir_key, &base_path)) {
base::FilePath path = base_path.Append(host_name + ".json");
if (base::PathExists(path))
return path;
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
index 74e8911..1b3a6e9 100644
--- a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
+++ b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
@@ -56,7 +56,7 @@
void PlatformKeysTestBase::SetUp() {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
embedded_test_server()->RegisterRequestHandler(base::BindRepeating(
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index 1cc32e8..22bbf3ac 100644
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -205,7 +205,7 @@
void ExtensionSessionsTest::CreateTestProfileSyncService() {
ProfileManager* profile_manager = g_browser_process->profile_manager();
base::FilePath path;
- PathService::Get(chrome::DIR_USER_DATA, &path);
+ base::PathService::Get(chrome::DIR_USER_DATA, &path);
path = path.AppendASCII("test_profile");
if (!base::PathExists(path))
CHECK(base::CreateDirectory(path));
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index fc1314f..df3de11 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -141,7 +141,7 @@
void LaunchTestingApp() {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath app_dir;
- PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir);
+ base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir);
app_dir = app_dir.AppendASCII(
"ppapi/tests/extensions/background_keepalive/newlib");
extension_ = LoadExtension(app_dir);
diff --git a/chrome/browser/extensions/browsertest_util.cc b/chrome/browser/extensions/browsertest_util.cc
index c03cc0e..d085db6 100644
--- a/chrome/browser/extensions/browsertest_util.cc
+++ b/chrome/browser/extensions/browsertest_util.cc
@@ -43,8 +43,8 @@
void CreateAndInitializeLocalCache() {
#if defined(OS_CHROMEOS)
base::FilePath extension_cache_dir;
- CHECK(PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
- &extension_cache_dir));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
+ &extension_cache_dir));
base::FilePath cache_init_file = extension_cache_dir.Append(
extensions::LocalExtensionCache::kCacheReadyFlagFileName);
EXPECT_EQ(base::WriteFile(cache_init_file, "", 0), 0);
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
index 0205bb2..cce474c 100644
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -76,7 +76,7 @@
base::FilePath directory_path = extension_path;
base::FilePath resources_dir;
base::FilePath relative_path;
- if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
+ if (!base::PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
!resources_dir.AppendRelativePath(directory_path, &relative_path)) {
return false;
}
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc
index 2e47fd77..8364e164 100644
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc
@@ -34,7 +34,7 @@
// Get the extension test data path.
base::FilePath test_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_path));
test_path = test_path.AppendASCII("extensions").AppendASCII("file_manager");
// Load the manifest data.
@@ -46,7 +46,7 @@
// Build a path inside Chrome's resources directory where a component
// extension might be installed.
base::FilePath resources_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_RESOURCES, &resources_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_RESOURCES, &resources_path));
resources_path = resources_path.AppendASCII("file_manager");
// Create a simulated component extension.
diff --git a/chrome/browser/extensions/chrome_info_map_unittest.cc b/chrome/browser/extensions/chrome_info_map_unittest.cc
index 7033305..77b2aee 100644
--- a/chrome/browser/extensions/chrome_info_map_unittest.cc
+++ b/chrome/browser/extensions/chrome_info_map_unittest.cc
@@ -18,7 +18,7 @@
scoped_refptr<Extension> LoadManifest(const std::string& dir,
const std::string& test_file) {
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions").AppendASCII(dir).AppendASCII(test_file);
JSONFileValueDeserializer deserializer(path);
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
index 6a2d44b..41e7ad9 100644
--- a/chrome/browser/extensions/chrome_url_request_util.cc
+++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -310,7 +310,7 @@
// Try to load extension resources from chrome resource file if
// directory_path is a descendant of resources_path. resources_path
// corresponds to src/chrome/browser/resources in source tree.
- if (PathService::Get(chrome::DIR_RESOURCES, &resources_path) &&
+ if (base::PathService::Get(chrome::DIR_RESOURCES, &resources_path) &&
// Since component extension resources are included in
// component_extension_resources.pak file in resources_path, calculate
// extension relative path against resources_path.
@@ -343,7 +343,7 @@
// |chrome_resources_path| corresponds to src/chrome/browser/resources in
// source tree.
base::FilePath chrome_resources_path;
- if (!PathService::Get(chrome::DIR_RESOURCES, &chrome_resources_path))
+ if (!base::PathService::Get(chrome::DIR_RESOURCES, &chrome_resources_path))
return base::FilePath();
// Since component extension resources are included in
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index c8cbcf2..0d199af7 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -119,7 +119,7 @@
const base::FilePath& directory)
: manifest(std::move(manifest_param)), root_directory(directory) {
if (!root_directory.IsAbsolute()) {
- CHECK(PathService::Get(chrome::DIR_RESOURCES, &root_directory));
+ CHECK(base::PathService::Get(chrome::DIR_RESOURCES, &root_directory));
root_directory = root_directory.Append(directory);
}
extension_id = GenerateId(manifest.get(), root_directory);
@@ -325,7 +325,7 @@
base::FilePath resources_path;
if ((chromeos::switches::IsZipArchiverPackerEnabled() ||
chromeos::switches::IsZipArchiverUnpackerEnabled()) &&
- PathService::Get(chrome::DIR_RESOURCES, &resources_path)) {
+ base::PathService::Get(chrome::DIR_RESOURCES, &resources_path)) {
AddWithNameAndDescriptionFromDir(
resources_path.Append(extension_misc::kZipArchiverExtensionPath),
extension_misc::kZipArchiverExtensionId,
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index aa59fd17..5c823c7 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -125,7 +125,7 @@
base::FilePath GetBasePath() {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
return test_data_dir.AppendASCII("extensions");
}
};
diff --git a/chrome/browser/extensions/content_capabilities_browsertest.cc b/chrome/browser/extensions/content_capabilities_browsertest.cc
index bd99c268..2b0875a 100644
--- a/chrome/browser/extensions/content_capabilities_browsertest.cc
+++ b/chrome/browser/extensions/content_capabilities_browsertest.cc
@@ -48,7 +48,7 @@
void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data));
embedded_test_server()->ServeFilesFromDirectory(
test_data.AppendASCII("extensions/content_capabilities"));
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index b14e368..55a4988 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -38,7 +38,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_basic.user.js");
@@ -91,7 +91,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_no_metadata.user.js");
@@ -140,7 +140,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_not_utf8.user.js");
@@ -158,7 +158,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_run_at_start.user.js");
@@ -193,7 +193,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_run_at_end.user.js");
@@ -228,7 +228,7 @@
ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
base::FilePath test_file;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file));
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_run_at_idle.user.js");
ASSERT_TRUE(base::PathExists(test_file)) << test_file.value();
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index d5fb61e..673aa4f 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -46,7 +46,7 @@
WebApplicationInfo::IconInfo result;
base::FilePath icon_file;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &icon_file)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &icon_file)) {
ADD_FAILURE() << "Could not get test data directory.";
return result;
}
diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
index c78dae67..5b4d9a2 100644
--- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
+++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
@@ -18,7 +18,7 @@
IN_PROC_BROWSER_TEST_F(CalculatorBrowserTest, Model) {
base::FilePath test_file;
- PathService::Get(chrome::DIR_TEST_DATA, &test_file);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_file);
test_file = test_file.DirName().DirName()
.AppendASCII("common").AppendASCII("extensions").AppendASCII("docs")
.AppendASCII("examples").AppendASCII("apps").AppendASCII("calculator")
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 11c7d3c..2c9a9b8 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -67,7 +67,7 @@
gfx::Image LoadIcon(const std::string& filename) {
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions/api_test").AppendASCII(filename);
std::string file_contents;
@@ -98,7 +98,7 @@
scoped_refptr<Extension> CreateExtension(const char* name) {
// Create and load an extension.
base::FilePath test_file;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
EXPECT_FALSE(true);
return NULL;
}
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index bbf966f..c8e7c07 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -495,7 +495,7 @@
test_data_dir_ = test_data_dir_.AppendASCII("api_test");
extensions::RegisterPathProvider();
- PathService::Get(extensions::DIR_TEST_DATA, &shared_test_data_dir_);
+ base::PathService::Get(extensions::DIR_TEST_DATA, &shared_test_data_dir_);
shared_test_data_dir_ = shared_test_data_dir_.AppendASCII("api_test");
// Backgrounded renderer processes run at a lower priority, causing the
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 5d82a5f..a9cbd6f6 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -175,7 +175,7 @@
}
void ExtensionBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("extensions");
// We don't want any warning bubbles for, e.g., unpacked extensions.
@@ -216,7 +216,7 @@
// chrome/test/data/extensions, and subclasses have a nasty habit of altering
// the data dir in SetUpCommandLine().
base::FilePath test_root_path;
- PathService::Get(chrome::DIR_TEST_DATA, &test_root_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_root_path);
test_root_path = test_root_path.AppendASCII("extensions");
test_protocol_handler_ =
base::Bind(&ExtensionProtocolTestHandler, test_root_path);
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 5671c21c..fe55b30 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -308,7 +308,7 @@
void UpdateExtension(const Extension* extension,
const std::string& update_crx) {
base::FilePath data_dir;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &data_dir)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &data_dir)) {
ADD_FAILURE();
return;
}
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index 9ec559c..07db300 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -111,7 +111,7 @@
gfx::Image default_icon = GetDefaultIcon();
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath manifest_path = test_dir.AppendASCII(
"extensions/image_loading_tracker/app.json");
@@ -154,7 +154,7 @@
gfx::Image default_icon = GetDefaultIcon();
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath manifest_path = test_dir.AppendASCII(
"extensions/file_manager/app.json");
@@ -198,7 +198,7 @@
const gfx::Image default_icon = GetDefaultIcon();
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath manifest_path =
test_dir.AppendASCII("extensions/context_menus/icons/manifest.json");
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 8b38789..9cf823e 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -509,7 +509,7 @@
void SetUpOnMainThread() override {
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data));
embedded_test_server()->ServeFilesFromDirectory(test_data.AppendASCII(
"extensions/api_test/messaging/externally_connectable/sites"));
MessagingApiTest::SetUpOnMainThread();
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 1dd71dfd..e45ea541 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -488,7 +488,7 @@
}
void Initialize() override {
- PathService::Get(chrome::DIR_TEST_DATA, &basedir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &basedir_);
now_ = Time::Now();
id1_ = prefs_.AddExtensionAndReturnId("1");
id2_ = prefs_.AddExtensionAndReturnId("2");
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 3382ab3..475fccad 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -69,13 +69,13 @@
base::FilePath GetTestPath(const std::string& name) {
base::FilePath path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &path));
return path.AppendASCII("extensions").AppendASCII(name);
}
base::FilePath GetContentVerifierTestPath() {
base::FilePath path;
- EXPECT_TRUE(PathService::Get(extensions::DIR_TEST_DATA, &path));
+ EXPECT_TRUE(base::PathService::Get(extensions::DIR_TEST_DATA, &path));
return path.AppendASCII("content_hash_fetcher")
.AppendASCII("different_sized_files");
}
@@ -111,7 +111,7 @@
.Build();
base::FilePath path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_RESOURCES, &path));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_RESOURCES, &path));
path = path.AppendASCII("web_store");
std::string error;
@@ -668,7 +668,7 @@
base::FilePath unzipped_path = temp_dir.GetPath();
base::FilePath path;
- EXPECT_TRUE(PathService::Get(extensions::DIR_TEST_DATA, &path));
+ EXPECT_TRUE(base::PathService::Get(extensions::DIR_TEST_DATA, &path));
scoped_refptr<Extension> extension =
content_verifier_test_utils::UnzipToDirAndLoadExtension(
diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc
index cfd74cd..09a169b 100644
--- a/chrome/browser/extensions/extension_service_test_base.cc
+++ b/chrome/browser/extensions/extension_service_test_base.cc
@@ -89,7 +89,7 @@
testing_local_state_(TestingBrowserProcess::GetGlobal()),
registry_(nullptr) {
base::FilePath test_data_dir;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) {
ADD_FAILURE();
return;
}
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index a6954d5..b1b86b1 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -89,7 +89,7 @@
bool SetUpUserDataDirectory() override {
base::FilePath profile_dir;
- PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir);
base::CreateDirectory(profile_dir);
@@ -99,7 +99,7 @@
if (load_extensions_.empty()) {
base::FilePath src_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
src_dir = src_dir.AppendASCII("extensions").AppendASCII("good");
base::CopyFile(src_dir.Append(chrome::kPreferencesFilename),
@@ -168,7 +168,7 @@
// Load a page affected by the content script and test to see the effect.
base::FilePath test_file;
- PathService::Get(chrome::DIR_TEST_DATA, &test_file);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_file);
test_file =
test_file.AppendASCII("extensions").AppendASCII("test_file.html");
@@ -256,7 +256,7 @@
public:
ExtensionsLoadTest() {
base::FilePath one_extension_path;
- PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
one_extension_path = one_extension_path.AppendASCII("extensions")
.AppendASCII("good")
.AppendASCII("Extensions")
@@ -290,7 +290,7 @@
public:
ExtensionsLoadMultipleTest() {
base::FilePath one_extension_path;
- PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
one_extension_path = one_extension_path.AppendASCII("extensions")
.AppendASCII("good")
.AppendASCII("Extensions")
@@ -299,19 +299,19 @@
load_extensions_.push_back(one_extension_path.value());
base::FilePath second_extension_path;
- PathService::Get(chrome::DIR_TEST_DATA, &second_extension_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &second_extension_path);
second_extension_path =
second_extension_path.AppendASCII("extensions").AppendASCII("app");
load_extensions_.push_back(second_extension_path.value());
base::FilePath third_extension_path;
- PathService::Get(chrome::DIR_TEST_DATA, &third_extension_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &third_extension_path);
third_extension_path =
third_extension_path.AppendASCII("extensions").AppendASCII("app1");
load_extensions_.push_back(third_extension_path.value());
base::FilePath fourth_extension_path;
- PathService::Get(chrome::DIR_TEST_DATA, &fourth_extension_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &fourth_extension_path);
fourth_extension_path =
fourth_extension_path.AppendASCII("extensions").AppendASCII("app2");
load_extensions_.push_back(fourth_extension_path.value());
diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc
index cf6cf5c..507401d6 100644
--- a/chrome/browser/extensions/extension_webui_apitest.cc
+++ b/chrome/browser/extensions/extension_webui_apitest.cc
@@ -40,7 +40,7 @@
base::ScopedAllowBlockingForTesting allow_blocking;
// Tests are located in chrome/test/data/extensions/webui/$(name).
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path =
path.AppendASCII("extensions").AppendASCII("webui").AppendASCII(name);
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index 53e9c07..fde0d9c1 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -238,12 +238,12 @@
auto prefs = std::make_unique<base::DictionaryValue>();
// TODO(skerner): Some values of base_path_id_ will cause
- // PathService::Get() to return false, because the path does
+ // base::PathService::Get() to return false, because the path does
// not exist. Find and fix the build/install scripts so that
// this can become a CHECK(). Known examples include chrome
// OS developer builds and linux install packages.
// Tracked as crbug.com/70402 .
- if (PathService::Get(base_path_id_, &base_path_)) {
+ if (base::PathService::Get(base_path_id_, &base_path_)) {
ReadExternalExtensionPrefFile(prefs.get());
if (!prefs->empty())
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index d154419..13ee682 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -131,7 +131,7 @@
}
if (url.path() == kAppPath) {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
std::string contents;
base::ReadFileToString(
test_data_dir.AppendASCII("extensions/dummyiap.crx"),
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index acaff7d7..0d5f0493 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -329,7 +329,7 @@
{
base::FilePath extdir;
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
extdir = extdir.AppendASCII("ppapi/tests/extensions/load_unload/newlib");
LazyBackgroundObserver page_complete;
ASSERT_TRUE(LoadExtension(extdir));
@@ -366,7 +366,7 @@
{
base::FilePath extdir;
base::ScopedAllowBlockingForTesting allow_blocking;
- ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
extdir = extdir.AppendASCII("ppapi/tests/extensions/popup/newlib");
ResultCatcher catcher;
const Extension* extension = LoadExtension(extdir);
diff --git a/chrome/browser/extensions/pack_extension_unittest.cc b/chrome/browser/extensions/pack_extension_unittest.cc
index 59a770b..40baeb4 100644
--- a/chrome/browser/extensions/pack_extension_unittest.cc
+++ b/chrome/browser/extensions/pack_extension_unittest.cc
@@ -20,7 +20,7 @@
class PackExtensionTest : public testing::Test {
public:
PackExtensionTest() {
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("extensions");
}
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 9f86623..06ddedcf 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -144,7 +144,7 @@
// MIME type to plugins which handle NaCl modules in order to allow the
// individual modules to handle these types.
base::FilePath path;
- if (!PathService::Get(chrome::FILE_NACL_PLUGIN, &path))
+ if (!base::PathService::Get(chrome::FILE_NACL_PLUGIN, &path))
return;
const content::PepperPluginInfo* pepper_info =
PluginService::GetInstance()->GetRegisteredPpapiPluginInfo(path);
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc
index c2ae44c8..94a48c2 100644
--- a/chrome/browser/extensions/process_manager_browsertest.cc
+++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -1107,7 +1107,7 @@
// open a <webview> when it's loaded.
ASSERT_TRUE(embedded_test_server()->Start());
base::FilePath dir;
- PathService::Get(chrome::DIR_TEST_DATA, &dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &dir);
dir = dir.AppendASCII("extensions")
.AppendASCII("platform_apps")
.AppendASCII("web_view")
diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc
index 6703aea..b8855bd 100644
--- a/chrome/browser/extensions/startup_helper_browsertest.cc
+++ b/chrome/browser/extensions/startup_helper_browsertest.cc
@@ -22,7 +22,7 @@
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kNoStartupWindow);
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("extensions");
InProcessBrowserTest::SetUpCommandLine(command_line);
}
diff --git a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
index 135dcb6e..35400d2b 100644
--- a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
+++ b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
@@ -14,8 +14,8 @@
namespace extensions {
ChromeOSExtensionCacheDelegate::ChromeOSExtensionCacheDelegate() {
- CHECK(PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
- &cache_dir_));
+ CHECK(base::PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
+ &cache_dir_));
}
ChromeOSExtensionCacheDelegate::ChromeOSExtensionCacheDelegate(
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 7358e3d..0182176 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -95,7 +95,7 @@
scoped_refptr<Extension> LoadExtension(const std::string& filename,
std::string* error) {
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.
AppendASCII("extensions").
AppendASCII("manifest_tests").
@@ -198,7 +198,7 @@
void LoadTestExtension() {
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath extension_path = test_dir
.AppendASCII("extensions")
.AppendASCII("good")
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index 6ea2da1e..e8460ea 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -581,7 +581,7 @@
MaybeAppendAuthUserParameter(approval_->authuser, &download_url_);
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder);
base::FilePath download_directory(g_download_directory_for_tests ?
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 9f09710..f6f9adef 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -140,7 +140,7 @@
IN_PROC_BROWSER_TEST_F(WindowOpenApiTest, WindowOpenPopupIframe) {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
ASSERT_TRUE(StartEmbeddedTestServer());
ASSERT_TRUE(LoadExtension(
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc
index 0159e28..98fbaa5 100644
--- a/chrome/browser/extensions/zipfile_installer_unittest.cc
+++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -137,7 +137,7 @@
void RunInstaller(const std::string& zip_name, bool expect_error) {
base::FilePath original_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &original_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &original_path));
original_path = original_path.AppendASCII("extensions")
.AppendASCII("zipfile_installer")
.AppendASCII(zip_name);
diff --git a/chrome/browser/file_select_helper_unittest.cc b/chrome/browser/file_select_helper_unittest.cc
index 93443945..8fe4b75 100644
--- a/chrome/browser/file_select_helper_unittest.cc
+++ b/chrome/browser/file_select_helper_unittest.cc
@@ -28,7 +28,7 @@
protected:
void SetUp() override {
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
data_dir_ = data_dir_.AppendASCII("file_select_helper");
ASSERT_TRUE(base::PathExists(data_dir_));
}
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 76117ba..79d6f211 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -372,7 +372,7 @@
bool GetFirstRunSentinelFilePath(base::FilePath* path) {
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return false;
*path = user_data_dir.Append(chrome::kFirstRunSentinel);
return true;
diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
index f2441e2..c6766661 100644
--- a/chrome/browser/first_run/first_run_internal_linux.cc
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
@@ -20,7 +20,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
+ if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
return base::FilePath();
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc
index 3af5f979..ec17ddf 100644
--- a/chrome/browser/first_run/first_run_internal_posix.cc
+++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -51,7 +51,7 @@
#endif
base::FilePath local_state_path;
- PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
+ base::PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
if (base::PathExists(local_state_path))
return false;
diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc
index 1da4593..ef08159e 100644
--- a/chrome/browser/first_run/first_run_internal_win.cc
+++ b/chrome/browser/first_run/first_run_internal_win.cc
@@ -43,7 +43,7 @@
bool LaunchSetupForEula(const base::FilePath::StringType& value,
int* ret_code) {
base::FilePath exe_dir;
- if (!PathService::Get(base::DIR_MODULE, &exe_dir))
+ if (!base::PathService::Get(base::DIR_MODULE, &exe_dir))
return false;
exe_dir = exe_dir.Append(installer::kInstallerDir);
base::FilePath exe_path = exe_dir.Append(installer::kSetupExe);
@@ -157,7 +157,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
+ if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
return base::FilePath();
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/chrome/browser/first_run/first_run_unittest.cc b/chrome/browser/first_run/first_run_unittest.cc
index 5698942..d3ef9ff 100644
--- a/chrome/browser/first_run/first_run_unittest.cc
+++ b/chrome/browser/first_run/first_run_unittest.cc
@@ -139,7 +139,7 @@
first_run::CreateSentinelIfNeeded();
// Gets the creation time of the first run sentinel.
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
base::File::Info info;
ASSERT_TRUE(base::GetFileInfo(user_data_dir.Append(chrome::kFirstRunSentinel),
&info));
@@ -149,7 +149,7 @@
TEST_F(FirstRunTest, GetFirstRunSentinelCreationTime_NotCreated) {
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
base::File::Info info;
ASSERT_FALSE(base::GetFileInfo(
user_data_dir.Append(chrome::kFirstRunSentinel), &info));
diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc
index 65e4f95..7396dc6 100644
--- a/chrome/browser/first_run/upgrade_util_linux.cc
+++ b/chrome/browser/first_run/upgrade_util_linux.cc
@@ -38,7 +38,7 @@
double GetLastModifiedTimeOfExe() {
base::FilePath exe_file_path;
- if (!PathService::Get(base::FILE_EXE, &exe_file_path)) {
+ if (!base::PathService::Get(base::FILE_EXE, &exe_file_path)) {
LOG(WARNING) << "Failed to get base::FilePath object for FILE_EXE.";
return saved_last_modified_time_of_exe;
}
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index af75420..b87e19b 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -46,7 +46,7 @@
namespace {
bool GetNewerChromeFile(base::FilePath* path) {
- if (!PathService::Get(base::DIR_EXE, path))
+ if (!base::PathService::Get(base::DIR_EXE, path))
return false;
*path = path->Append(installer::kChromeNewExe);
return true;
@@ -81,7 +81,7 @@
bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return false;
}
diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc
index d6de41e..292e42de 100644
--- a/chrome/browser/google/google_update_settings_posix.cc
+++ b/chrome/browser/google/google_update_settings_posix.cc
@@ -59,7 +59,7 @@
// static
bool GoogleUpdateSettings::GetCollectStatsConsent() {
base::FilePath consent_file;
- PathService::Get(chrome::DIR_USER_DATA, &consent_file);
+ base::PathService::Get(chrome::DIR_USER_DATA, &consent_file);
consent_file = consent_file.Append(kConsentToSendStats);
if (!base::DirectoryExists(consent_file.DirName()))
@@ -83,7 +83,7 @@
#endif
base::FilePath consent_dir;
- PathService::Get(chrome::DIR_USER_DATA, &consent_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &consent_dir);
if (!base::DirectoryExists(consent_dir))
return false;
diff --git a/chrome/browser/google/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc
index c78235d1..1bd1852 100644
--- a/chrome/browser/google/google_update_settings_unittest.cc
+++ b/chrome/browser/google/google_update_settings_unittest.cc
@@ -86,7 +86,7 @@
EXPECT_TRUE(GoogleUpdateSettings::SetCollectStatsConsent(true));
base::FilePath consent_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &consent_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &consent_dir));
ASSERT_TRUE(base::DirectoryExists(consent_dir));
base::FilePath consent_file = consent_dir.Append("Consent To Send Stats");
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc
index df33d514..6a1eda72 100644
--- a/chrome/browser/google/google_update_win.cc
+++ b/chrome/browser/google/google_update_win.cc
@@ -490,7 +490,7 @@
// Instantiate GoogleUpdate3Web{Machine,User}Class.
if (!google_update_) {
base::FilePath chrome_exe;
- if (!PathService::Get(base::DIR_EXE, &chrome_exe))
+ if (!base::PathService::Get(base::DIR_EXE, &chrome_exe))
NOTREACHED();
system_level_install_ = !InstallUtil::IsPerUserInstall();
diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc
index c9146aa..7bce75e 100644
--- a/chrome/browser/google/google_update_win_unittest.cc
+++ b/chrome/browser/google/google_update_win_unittest.cc
@@ -546,7 +546,7 @@
// Override FILE_EXE so that it looks like the test is running from the
// standard install location for this mode (system-level or user-level).
base::FilePath file_exe;
- ASSERT_TRUE(PathService::Get(base::FILE_EXE, &file_exe));
+ ASSERT_TRUE(base::PathService::Get(base::FILE_EXE, &file_exe));
base::FilePath install_dir(
installer::GetChromeInstallPath(system_level_install_));
file_exe_override_.reset(new base::ScopedPathOverride(
@@ -556,13 +556,13 @@
// Override these paths so that they can be found after the registry
// override manager is in place.
base::FilePath temp;
- PathService::Get(base::DIR_PROGRAM_FILES, &temp);
+ base::PathService::Get(base::DIR_PROGRAM_FILES, &temp);
program_files_override_.reset(
new base::ScopedPathOverride(base::DIR_PROGRAM_FILES, temp));
- PathService::Get(base::DIR_PROGRAM_FILESX86, &temp);
+ base::PathService::Get(base::DIR_PROGRAM_FILESX86, &temp);
program_files_x86_override_.reset(
new base::ScopedPathOverride(base::DIR_PROGRAM_FILESX86, temp));
- PathService::Get(base::DIR_LOCAL_APP_DATA, &temp);
+ base::PathService::Get(base::DIR_LOCAL_APP_DATA, &temp);
local_app_data_override_.reset(
new base::ScopedPathOverride(base::DIR_LOCAL_APP_DATA, temp));
@@ -672,8 +672,8 @@
// non-standard location.
base::FilePath file_exe;
base::FilePath dir_temp;
- ASSERT_TRUE(PathService::Get(base::FILE_EXE, &file_exe));
- ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &dir_temp));
+ ASSERT_TRUE(base::PathService::Get(base::FILE_EXE, &file_exe));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_TEMP, &dir_temp));
file_exe_override_.reset();
file_exe_override_.reset(new base::ScopedPathOverride(
base::FILE_EXE, dir_temp.Append(file_exe.BaseName()),
diff --git a/chrome/browser/history/android/android_urls_database_unittest.cc b/chrome/browser/history/android/android_urls_database_unittest.cc
index f59d983e..21c0a33 100644
--- a/chrome/browser/history/android/android_urls_database_unittest.cc
+++ b/chrome/browser/history/android/android_urls_database_unittest.cc
@@ -27,7 +27,7 @@
profile_.reset(new TestingProfile);
base::FilePath data_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII("History");
history_db_name_ = profile_->GetPath().Append(kHistoryFilename);
diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc
index 1742658b..74fc5c4c 100644
--- a/chrome/browser/importer/edge_importer_browsertest_win.cc
+++ b/chrome/browser/importer/edge_importer_browsertest_win.cc
@@ -198,7 +198,7 @@
kEdgeFaviconGroup, kEdgeFaviconGroup + arraysize(kEdgeFaviconGroup));
base::FilePath data_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII("edge_profile");
base::FilePath temp_path = temp_dir_.GetPath();
@@ -242,7 +242,7 @@
kEdgeFaviconGroup, kEdgeFaviconGroup + arraysize(kEdgeFaviconGroup));
base::FilePath data_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII("edge_profile");
{
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc
index f2f9dcc5..3ab2558 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -286,11 +286,11 @@
importer::ImporterProgressObserver* observer,
ProfileWriter* writer) {
base::FilePath data_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII(profile_dir);
ASSERT_TRUE(base::CopyDirectory(data_path, profile_path_, true));
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII("firefox3_nss");
ASSERT_TRUE(base::CopyDirectory(data_path, profile_path_, false));
@@ -305,7 +305,7 @@
base::CreateDirectory(custom_search_engine_path);
// Copy over search engines.
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &data_path));
data_path = data_path.AppendASCII("firefox_searchplugins");
base::FilePath default_search_engine_source_path =
data_path.AppendASCII("default");
diff --git a/chrome/browser/load_library_perf_test.cc b/chrome/browser/load_library_perf_test.cc
index 3424836..a2d0707 100644
--- a/chrome/browser/load_library_perf_test.cc
+++ b/chrome/browser/load_library_perf_test.cc
@@ -31,7 +31,7 @@
const base::FilePath& library_relative_dir,
const base::FilePath& library_name) {
base::FilePath output_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &output_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_MODULE, &output_dir));
output_dir = output_dir.Append(library_relative_dir);
base::FilePath library_path = output_dir.Append(library_name);
ASSERT_TRUE(base::PathExists(library_path)) << library_path.value();
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
index 2b17790..20e9ad3f 100644
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
@@ -474,7 +474,7 @@
prefs::kGoogleServicesUserAccountId, "account_id");
base::FilePath root_http;
- PathService::Get(chrome::DIR_TEST_DATA, &root_http);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &root_http);
root_http = root_http.AppendASCII("mirror_request_header");
struct TestCase {
diff --git a/chrome/browser/local_discovery/service_discovery_shared_client.cc b/chrome/browser/local_discovery/service_discovery_shared_client.cc
index cdaa3e55..88561686 100644
--- a/chrome/browser/local_discovery/service_discovery_shared_client.cc
+++ b/chrome/browser/local_discovery/service_discovery_shared_client.cc
@@ -38,7 +38,7 @@
#if defined(OS_WIN)
void ReportFirewallStats() {
base::FilePath exe_path;
- if (!PathService::Get(base::FILE_EXE, &exe_path))
+ if (!base::PathService::Get(base::FILE_EXE, &exe_path))
return;
base::ElapsedTimer timer;
std::unique_ptr<installer::FirewallManager> manager =
diff --git a/chrome/browser/mac/relauncher.mm b/chrome/browser/mac/relauncher.mm
index 2521b2c..32fbc9f 100644
--- a/chrome/browser/mac/relauncher.mm
+++ b/chrome/browser/mac/relauncher.mm
@@ -82,7 +82,7 @@
// helper process, because there's no guarantee that the updated version's
// relauncher implementation will be compatible with the running version's.
base::FilePath child_path;
- if (!PathService::Get(content::CHILD_PROCESS_EXE, &child_path)) {
+ if (!base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path)) {
LOG(ERROR) << "No CHILD_PROCESS_EXE";
return false;
}
diff --git a/chrome/browser/media/media_engagement_autoplay_browsertest.cc b/chrome/browser/media/media_engagement_autoplay_browsertest.cc
index eecb5e1..bf499cb 100644
--- a/chrome/browser/media/media_engagement_autoplay_browsertest.cc
+++ b/chrome/browser/media/media_engagement_autoplay_browsertest.cc
@@ -161,7 +161,7 @@
// Get the path to the "generator" binary in the module path.
base::FilePath module_dir;
- EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &module_dir));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_MODULE, &module_dir));
// Launch the generator and wait for it to finish.
base::CommandLine cmd(GetPythonPath());
@@ -180,7 +180,7 @@
void ApplyEmptyPreloadedList() {
// Get the path relative to the source root.
base::FilePath source_root;
- EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(MediaEngagementPreloadedList::GetInstance()->LoadFromFile(
diff --git a/chrome/browser/media/media_engagement_preloaded_list_unittest.cc b/chrome/browser/media/media_engagement_preloaded_list_unittest.cc
index 31f0a4f..75ace4e 100644
--- a/chrome/browser/media/media_engagement_preloaded_list_unittest.cc
+++ b/chrome/browser/media/media_engagement_preloaded_list_unittest.cc
@@ -38,9 +38,9 @@
base::FilePath GetModulePath() {
base::FilePath module_dir;
#if defined(OS_ANDROID)
- EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &module_dir));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &module_dir));
#else
- EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &module_dir));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_MODULE, &module_dir));
#endif
return module_dir;
}
diff --git a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
index b029655..86c027a 100644
--- a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
@@ -199,7 +199,7 @@
base::FilePath GetSourceDir() {
base::FilePath source_dir;
- PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
return source_dir;
}
diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc/webrtc_browsertest_base.cc
index b49ae90..ed10bf1 100644
--- a/chrome/browser/media/webrtc/webrtc_browsertest_base.cc
+++ b/chrome/browser/media/webrtc/webrtc_browsertest_base.cc
@@ -764,7 +764,7 @@
if (!desktop_capture_extension_.get()) {
extensions::ChromeTestExtensionLoader loader(browser()->profile());
base::FilePath extension_path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_path));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &extension_path));
extension_path = extension_path.AppendASCII("extensions/desktop_capture");
desktop_capture_extension_ = loader.LoadExtension(extension_path);
LOG(INFO) << "Loaded desktop capture extension, id = "
diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc
index 00105e3..5a52dc70 100644
--- a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc
+++ b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc
@@ -50,7 +50,7 @@
base::FilePath GetReferenceFilesDir() {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
return test_data_dir.Append(kReferenceFilesDirName);
}
diff --git a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
index eda6c34..8fde3e73 100644
--- a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
@@ -324,13 +324,13 @@
private:
base::FilePath GetSourceDir() {
base::FilePath source_dir;
- PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
return source_dir;
}
base::FilePath GetBrowserDir() {
base::FilePath browser_dir;
- EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &browser_dir));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_MODULE, &browser_dir));
return browser_dir;
}
diff --git a/chrome/browser/media/wv_test_license_server_config.cc b/chrome/browser/media/wv_test_license_server_config.cc
index 6d65988..f8d3b1f 100644
--- a/chrome/browser/media/wv_test_license_server_config.cc
+++ b/chrome/browser/media/wv_test_license_server_config.cc
@@ -149,7 +149,7 @@
void WVTestLicenseServerConfig::GetLicenseServerRootPath(
base::FilePath* path) {
base::FilePath source_root;
- PathService::Get(base::DIR_SOURCE_ROOT, &source_root);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root);
*path = source_root.Append(FILE_PATH_LITERAL("third_party"))
.Append(FILE_PATH_LITERAL("widevine"))
.Append(FILE_PATH_LITERAL("test"))
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
index fea64e8..80ec88c 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
@@ -64,7 +64,7 @@
base::FilePath GetMediaTestDir() {
base::FilePath test_file;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &test_file))
+ if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &test_file))
return base::FilePath();
return test_file.AppendASCII("media").AppendASCII("test").AppendASCII("data");
}
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
index a53a42e1..2be9c73 100644
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -1057,11 +1057,11 @@
// on the test platform. In ChromeOS, these directories do not exist.
base::FilePath path;
if (num_auto_galleries() > 0) {
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_MUSIC, &path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_MUSIC, &path));
profile_state->AddNameForAllCompare(GetExpectedFolderName(path));
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_PICTURES, &path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_PICTURES, &path));
profile_state->AddNameForAllCompare(GetExpectedFolderName(path));
- ASSERT_TRUE(PathService::Get(chrome::DIR_USER_VIDEOS, &path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_USER_VIDEOS, &path));
profile_state->AddNameForAllCompare(GetExpectedFolderName(path));
profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries);
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.cc b/chrome/browser/media_galleries/media_galleries_permission_controller.cc
index 08299df..72bfee8 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.cc
@@ -207,7 +207,7 @@
extensions::file_system_api::GetLastChooseEntryDirectory(
extensions::ExtensionPrefs::Get(GetProfile()), extension_->id());
if (default_path.empty())
- PathService::Get(base::DIR_USER_DESKTOP, &default_path);
+ base::PathService::Get(base::DIR_USER_DESKTOP, &default_path);
select_folder_dialog_ = ui::SelectFileDialog::Create(
this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
select_folder_dialog_->SelectFile(
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc
index d9aaa21..7390d00 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -401,7 +401,8 @@
#if defined(OS_CHROMEOS)
// See chrome/browser/chromeos/fileapi/file_system_backend.cc
base::FilePath download_path;
- if (PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS_SAFE, &download_path)) {
+ if (base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS_SAFE,
+ &download_path)) {
base::FilePath relative;
if (download_path.AppendRelativePath(path, &relative))
return relative.LossyDisplayName();
@@ -508,7 +509,7 @@
for (size_t i = 0; i < arraysize(kDirectories); ++i) {
base::FilePath path;
- if (!PathService::Get(kDirectories[i].directory_key, &path))
+ if (!base::PathService::Get(kDirectories[i].directory_key, &path))
continue;
base::FilePath relative_path;
@@ -906,11 +907,12 @@
base::FilePath music_path;
base::FilePath pictures_path;
base::FilePath videos_path;
- bool got_music_path = PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
+ bool got_music_path =
+ base::PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
bool got_pictures_path =
- PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
+ base::PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
bool got_videos_path =
- PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
+ base::PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
PrefService* prefs = profile_->GetPrefs();
std::unique_ptr<ListPrefUpdate> update(
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
index 717f6f8..f3fe09b 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
@@ -1240,11 +1240,12 @@
base::FilePath music_path;
base::FilePath pictures_path;
base::FilePath videos_path;
- bool got_music_path = PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
+ bool got_music_path =
+ base::PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
bool got_pictures_path =
- PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
+ base::PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
bool got_videos_path =
- PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
+ base::PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
int num_default_galleries = 0;
@@ -1296,11 +1297,11 @@
base::FilePath old_pictures_path;
base::FilePath old_videos_path;
bool got_old_music_path =
- PathService::Get(chrome::DIR_USER_MUSIC, &old_music_path);
+ base::PathService::Get(chrome::DIR_USER_MUSIC, &old_music_path);
bool got_old_pictures_path =
- PathService::Get(chrome::DIR_USER_PICTURES, &old_pictures_path);
+ base::PathService::Get(chrome::DIR_USER_PICTURES, &old_pictures_path);
bool got_old_videos_path =
- PathService::Get(chrome::DIR_USER_VIDEOS, &old_videos_path);
+ base::PathService::Get(chrome::DIR_USER_VIDEOS, &old_videos_path);
bool found_music = false;
bool found_pictures = false;
@@ -1347,11 +1348,11 @@
base::FilePath new_pictures_path;
base::FilePath new_videos_path;
bool got_new_music_path =
- PathService::Get(chrome::DIR_USER_MUSIC, &new_music_path);
+ base::PathService::Get(chrome::DIR_USER_MUSIC, &new_music_path);
bool got_new_pictures_path =
- PathService::Get(chrome::DIR_USER_PICTURES, &new_pictures_path);
+ base::PathService::Get(chrome::DIR_USER_PICTURES, &new_pictures_path);
bool got_new_videos_path =
- PathService::Get(chrome::DIR_USER_VIDEOS, &new_videos_path);
+ base::PathService::Get(chrome::DIR_USER_VIDEOS, &new_videos_path);
EXPECT_NE(new_music_path, old_music_path);
EXPECT_NE(new_pictures_path, old_pictures_path);
@@ -1421,11 +1422,12 @@
base::FilePath music_path;
base::FilePath pictures_path;
base::FilePath videos_path;
- bool got_music_path = PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
+ bool got_music_path =
+ base::PathService::Get(chrome::DIR_USER_MUSIC, &music_path);
bool got_pictures_path =
- PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
+ base::PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path);
bool got_videos_path =
- PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
+ base::PathService::Get(chrome::DIR_USER_VIDEOS, &videos_path);
bool found_music = false;
bool found_pictures = false;
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index 11515e7..050620d 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -30,7 +30,7 @@
MemoryDetails::MemoryDetails() {
base::FilePath browser_process_path;
- PathService::Get(base::FILE_EXE, &browser_process_path);
+ base::PathService::Get(base::FILE_EXE, &browser_process_path);
ProcessData process;
process.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win.cc b/chrome/browser/metrics/antivirus_metrics_provider_win.cc
index 205b329..7f164fb 100644
--- a/chrome/browser/metrics/antivirus_metrics_provider_win.cc
+++ b/chrome/browser/metrics/antivirus_metrics_provider_win.cc
@@ -481,7 +481,7 @@
// Rapport always installs into 32-bit Program Files in directory
// %DIR_PROGRAM_FILESX86%\Trusteer\Rapport
base::FilePath binary_path;
- if (!PathService::Get(base::DIR_PROGRAM_FILESX86, &binary_path))
+ if (!base::PathService::Get(base::DIR_PROGRAM_FILESX86, &binary_path))
return;
binary_path = binary_path.AppendASCII("Trusteer")
diff --git a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc
index 37823f0f..033d973 100644
--- a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc
+++ b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc
@@ -72,7 +72,7 @@
// Add a request handler for serving audio.
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
embedded_test_server()->ServeFilesFromDirectory(
test_data_dir.AppendASCII("chrome/test/data/"));
// Start the test server after adding the request handler for thread safety.
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc
index 18397a5..fbd9d10 100644
--- a/chrome/browser/metrics/metrics_service_browsertest.cc
+++ b/chrome/browser/metrics/metrics_service_browsertest.cc
@@ -122,7 +122,7 @@
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION;
base::FilePath test_directory;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_directory));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_directory));
base::FilePath page1_path = test_directory.AppendASCII("title2.html");
ui_test_utils::NavigateToURLWithDisposition(
diff --git a/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc b/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
index 1bdd104..dd3423b 100644
--- a/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
+++ b/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
@@ -47,7 +47,7 @@
is_enabled);
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return base::FilePath();
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc
index 1de6640..f9ac1ac 100644
--- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc
+++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc
@@ -74,22 +74,22 @@
bool NaClBrowserDelegateImpl::GetCacheDirectory(base::FilePath* cache_dir) {
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return false;
chrome::GetUserCacheDirectory(user_data_dir, cache_dir);
return true;
}
bool NaClBrowserDelegateImpl::GetPluginDirectory(base::FilePath* plugin_dir) {
- return PathService::Get(chrome::DIR_INTERNAL_PLUGINS, plugin_dir);
+ return base::PathService::Get(chrome::DIR_INTERNAL_PLUGINS, plugin_dir);
}
bool NaClBrowserDelegateImpl::GetPnaclDirectory(base::FilePath* pnacl_dir) {
- return PathService::Get(chrome::DIR_PNACL_COMPONENT, pnacl_dir);
+ return base::PathService::Get(chrome::DIR_PNACL_COMPONENT, pnacl_dir);
}
bool NaClBrowserDelegateImpl::GetUserDirectory(base::FilePath* user_dir) {
- return PathService::Get(chrome::DIR_USER_DATA, user_dir);
+ return base::PathService::Get(chrome::DIR_USER_DATA, user_dir);
}
std::string NaClBrowserDelegateImpl::GetVersionString() const {
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
index ae6f097..b208a60e 100644
--- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
+++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -41,7 +41,7 @@
// We call python script to reuse GDB RSP protocol implementation.
base::CommandLine cmd(base::FilePath(FILE_PATH_LITERAL("python")));
base::FilePath script;
- PathService::Get(chrome::DIR_TEST_DATA, &script);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &script);
script = script.AppendASCII("nacl/debug_stub_browser_tests.py");
cmd.AppendArgPath(script);
cmd.AppendArg(base::IntToString(debug_stub_port));
diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
index 80141fb..ddad81f 100644
--- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
+++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
@@ -34,7 +34,7 @@
PPAPINaClNewlibTest::SetUpCommandLine(command_line);
base::FilePath mock_nacl_gdb;
- EXPECT_TRUE(PathService::Get(base::DIR_EXE, &mock_nacl_gdb));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_EXE, &mock_nacl_gdb));
mock_nacl_gdb = mock_nacl_gdb.Append(kMockNaClGdb);
command_line->AppendSwitchPath(switches::kNaClGdb, mock_nacl_gdb);
EXPECT_TRUE(base::CreateTemporaryFile(&script_));
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 511d85e..68b06dd 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -165,7 +165,8 @@
#elif defined(OS_ANDROID)
// Access to files in external storage is allowed.
base::FilePath external_storage_path;
- PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE, &external_storage_path);
+ base::PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE,
+ &external_storage_path);
if (external_storage_path.IsParent(path))
return true;
diff --git a/chrome/browser/net/chrome_network_delegate_browsertest.cc b/chrome/browser/net/chrome_network_delegate_browsertest.cc
index d19a21f..01493090a 100644
--- a/chrome/browser/net/chrome_network_delegate_browsertest.cc
+++ b/chrome/browser/net/chrome_network_delegate_browsertest.cc
@@ -39,7 +39,7 @@
// via file: scheme is rejected with ERR_ACCESS_DENIED.
IN_PROC_BROWSER_TEST_F(ChromeNetworkDelegateBrowserTest, AccessToFile) {
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath test_file = test_dir.AppendASCII("empty.html");
ASSERT_FALSE(
ChromeNetworkDelegate::IsAccessAllowed(test_file, base::FilePath()));
@@ -58,13 +58,13 @@
// ERR_ACCESS_DENIED.
IN_PROC_BROWSER_TEST_F(ChromeNetworkDelegateBrowserTest, AccessToSymlink) {
base::FilePath test_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
base::FilePath test_file = test_dir.AppendASCII("empty.html");
ASSERT_FALSE(
ChromeNetworkDelegate::IsAccessAllowed(test_file, base::FilePath()));
base::FilePath temp_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &temp_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_TEMP, &temp_dir));
base::ScopedTempDir scoped_temp_dir;
ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDirUnderPath(temp_dir));
base::FilePath symlink = scoped_temp_dir.GetPath().AppendASCII("symlink");
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index 3418ef2d..e4b2df2 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -609,7 +609,7 @@
#if defined(OS_CHROMEOS)
base::FilePath temp_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &temp_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_TEMP, &temp_dir));
// Chrome OS allows the following directories.
EXPECT_TRUE(IsAccessAllowed("/home/chronos/user/Downloads", ""));
EXPECT_TRUE(IsAccessAllowed("/home/chronos/user/log", ""));
@@ -642,7 +642,8 @@
// Files in external storage are allowed.
base::FilePath external_storage_path;
- PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE, &external_storage_path);
+ base::PathService::Get(base::DIR_ANDROID_EXTERNAL_STORAGE,
+ &external_storage_path);
EXPECT_TRUE(IsAccessAllowed(
external_storage_path.AppendASCII("foo.txt").AsUTF8Unsafe(), ""));
// The external storage root itself is not allowed.
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
index 9ce0468..31235f30 100644
--- a/chrome/browser/net/dns_probe_browsertest.cc
+++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -110,7 +110,7 @@
FilePath GetMockLinkDoctorFilePath() {
FilePath root_http;
- PathService::Get(chrome::DIR_TEST_DATA, &root_http);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &root_http);
return root_http.AppendASCII("mock-link-doctor.json");
}
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index 78824398..8532920 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -39,7 +39,7 @@
net::URLRequestSlowDownloadJob::AddUrlHandler();
base::FilePath root_http;
- PathService::Get(chrome::DIR_TEST_DATA, &root_http);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &root_http);
net::URLRequestMockHTTPJob::AddUrlHandlers(root_http);
} else {
// Revert to the default handlers.
@@ -59,7 +59,7 @@
return false;
base::FilePath file_path;
- PathService::Get(chrome::DIR_TEST_DATA, &file_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &file_path);
file_path = file_path.AppendASCII(path);
std::string contents;
diff --git a/chrome/browser/notifications/notification_helper_launches_chrome_unittest.cc b/chrome/browser/notifications/notification_helper_launches_chrome_unittest.cc
index d793754..c44f839d 100644
--- a/chrome/browser/notifications/notification_helper_launches_chrome_unittest.cc
+++ b/chrome/browser/notifications/notification_helper_launches_chrome_unittest.cc
@@ -211,7 +211,7 @@
// test executable, as the test build target has a data_deps dependency on
// it.
base::FilePath dir_exe;
- ASSERT_TRUE(PathService::Get(base::DIR_EXE, &dir_exe));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_EXE, &dir_exe));
base::FilePath notification_helper_path =
dir_exe.Append(installer::kNotificationHelperExe);
diff --git a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
index 4814906..78a5f10 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
@@ -66,7 +66,7 @@
Profile* CreateTestingProfile(const std::string& profile_name) {
base::FilePath path;
- PathService::Get(chrome::DIR_USER_DATA, &path);
+ base::PathService::Get(chrome::DIR_USER_DATA, &path);
path = path.AppendASCII(profile_name);
return CreateTestingProfile(path);
}
diff --git a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
index 3a055bd7..1773f332 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -623,7 +623,7 @@
// This case should fail because a file URL is used.
base::FilePath dir_source_root;
- EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root));
base::FilePath full_file_path =
dir_source_root.Append(server_root_).AppendASCII(kTestFileName);
GURL file_url(net::FilePathToFileURL(full_file_path));
diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
index 7247d001..791f0c6 100644
--- a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
+++ b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
@@ -55,7 +55,7 @@
base::FilePath persistent_archives_dir =
profile->GetPath().Append(chrome::kOfflinePageArchivesDirname);
- // If PathService::Get returns false, the temporary_archives_dir will be
+ // If base::PathService::Get returns false, the temporary_archives_dir will be
// empty, and no temporary pages will be saved during this chrome lifecycle.
base::FilePath temporary_archives_dir;
if (PathService::Get(base::DIR_CACHE, &temporary_archives_dir)) {
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
index 4c7f0fd..8d04667 100644
--- a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
@@ -179,7 +179,8 @@
void OfflinePageMHTMLArchiverTest::SetUp() {
base::FilePath test_data_dir_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_path));
+ ASSERT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_path));
archive_dir_path_ = test_data_dir_path.AppendASCII("offline_pages");
}
diff --git a/chrome/browser/offline_pages/offline_page_request_job_unittest.cc b/chrome/browser/offline_pages/offline_page_request_job_unittest.cc
index 3900d635..ab82af5 100644
--- a/chrome/browser/offline_pages/offline_page_request_job_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_request_job_unittest.cc
@@ -585,7 +585,7 @@
// model's maintenance tasks must not be executed in the meantime otherwise
// these files will be wiped by consistency checks.
base::FilePath test_data_dir_path;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_path);
base::FilePath test_data_private_archives_dir =
test_data_dir_path.AppendASCII(kPrivateOfflineFileDir);
ASSERT_TRUE(base::CopyDirectory(test_data_private_archives_dir,
diff --git a/chrome/browser/offline_pages/test_offline_page_model_builder.cc b/chrome/browser/offline_pages/test_offline_page_model_builder.cc
index 88ebfd3..8644bb07 100644
--- a/chrome/browser/offline_pages/test_offline_page_model_builder.cc
+++ b/chrome/browser/offline_pages/test_offline_page_model_builder.cc
@@ -37,7 +37,7 @@
base::FilePath private_archives_dir =
context->GetPath().Append(chrome::kOfflinePageArchivesDirname);
base::FilePath public_archives_dir("/sdcard/Download");
- // If PathService::Get returns false, the temporary_archives_dir will be
+ // If base::PathService::Get returns false, the temporary_archives_dir will be
// empty, and no temporary pages will be saved during this chrome lifecycle.
base::FilePath temporary_archives_dir;
if (PathService::Get(base::DIR_CACHE, &temporary_archives_dir)) {
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index 685f3b6e..fbd9002 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -105,7 +105,7 @@
GURL GetFileURL(const char* filename) {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("password").AppendASCII(filename);
CHECK(base::PathExists(path));
return net::FilePathToFileURL(path);
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 55ae52d..80411b4 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -164,13 +164,13 @@
{
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
test_data_dir = test_data_dir.Append(FILE_PATH_LITERAL("pdf"));
base::FilePath test_util_path = test_data_dir.AppendASCII("test_util.js");
ASSERT_TRUE(base::ReadFileToString(test_util_path, &test_util_js));
base::FilePath source_root_dir;
- PathService::Get(base::DIR_SOURCE_ROOT, &source_root_dir);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root_dir);
base::FilePath mock_interactions_path = source_root_dir.Append(
FILE_PATH_LITERAL("third_party/polymer/v1_0/components-chromium/"
"iron-test-helpers/mock-interactions.js"));
@@ -230,7 +230,7 @@
void LoadAllPdfsTest(const std::string& dir_name, int k) {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
base::FileEnumerator file_enumerator(test_data_dir.AppendASCII(dir_name),
false, base::FileEnumerator::FILES,
FILE_PATH_LITERAL("*.pdf"));
@@ -588,7 +588,7 @@
{
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
test_data_dir = test_data_dir.Append(FILE_PATH_LITERAL("pdf"));
base::FilePath test_data_file = test_data_dir.AppendASCII("test.pdf");
ASSERT_TRUE(PathExists(test_data_file));
diff --git a/chrome/browser/plugins/flash_permission_browsertest.cc b/chrome/browser/plugins/flash_permission_browsertest.cc
index c50f67bc..36539ff 100644
--- a/chrome/browser/plugins/flash_permission_browsertest.cc
+++ b/chrome/browser/plugins/flash_permission_browsertest.cc
@@ -195,7 +195,7 @@
IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, AllowFileURL) {
base::FilePath test_path;
- PathService::Get(chrome::DIR_TEST_DATA, &test_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_path);
ui_test_utils::NavigateToURL(
browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url()));
CommonSucceedsIfAllowed();
@@ -210,7 +210,7 @@
IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, BlockFileURL) {
base::FilePath test_path;
- PathService::Get(chrome::DIR_TEST_DATA, &test_path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_path);
ui_test_utils::NavigateToURL(
browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url()));
CommonFailsIfBlocked();
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc
index b08000e..9e8c985 100644
--- a/chrome/browser/plugins/plugin_prefs.cc
+++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -121,7 +121,7 @@
base::FilePath last_internal_dir =
prefs_->GetFilePath(prefs::kPluginsLastInternalDirectory);
base::FilePath cur_internal_dir;
- if (PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &cur_internal_dir) &&
+ if (base::PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &cur_internal_dir) &&
cur_internal_dir != last_internal_dir) {
update_internal_dir = true;
prefs_->SetFilePath(
@@ -256,7 +256,7 @@
plugins_list->Clear();
base::FilePath internal_dir;
- if (PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir))
+ if (base::PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir))
prefs_->SetFilePath(prefs::kPluginsLastInternalDirectory, internal_dir);
base::AutoLock auto_lock(lock_);
diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc
index f97c9f7..769ff02 100644
--- a/chrome/browser/plugins/plugin_prefs_factory.cc
+++ b/chrome/browser/plugins/plugin_prefs_factory.cc
@@ -54,7 +54,7 @@
void PluginPrefsFactory::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
base::FilePath internal_dir;
- PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
+ base::PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
registry->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
internal_dir);
registry->RegisterListPref(prefs::kPluginsPluginsList);
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc
index 1bff9b0..0a94d60 100644
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -62,7 +62,7 @@
std::unique_ptr<MachineLevelUserCloudPolicyManager>
CreateMachineLevelUserCloudPolicyManager() {
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return nullptr;
DVLOG(1) << "Creating machine level cloud policy manager";
@@ -213,7 +213,7 @@
std::move(loader));
#elif defined(OS_POSIX) && !defined(OS_ANDROID)
base::FilePath config_dir_path;
- if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
+ if (base::PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
std::unique_ptr<AsyncPolicyLoader> loader(new ConfigDirPolicyLoader(
base::CreateSequencedTaskRunnerWithTraits(
{base::MayBlock(), base::TaskPriority::BACKGROUND}),
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 7981def..42c93d7 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -259,8 +259,8 @@
#if defined(OS_CHROMEOS)
// Get the path to the user policy key file.
base::FilePath user_policy_key_dir;
- ASSERT_TRUE(
- PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_policy_key_dir));
+ ASSERT_TRUE(base::PathService::Get(chromeos::DIR_USER_POLICY_KEYS,
+ &user_policy_key_dir));
std::string sanitized_username =
chromeos::CryptohomeClient::GetStubSanitizedUsername(
cryptohome::Identification(
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
index 0c6504b..488c8ce 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
@@ -153,7 +153,7 @@
scoped_refptr<const extensions::Extension> LoadExtension(
const base::FilePath::CharType* path) {
base::FilePath full_path;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &full_path)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &full_path)) {
ADD_FAILURE();
return NULL;
}
diff --git a/chrome/browser/policy/cloud/machine_level_user_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/machine_level_user_cloud_policy_browsertest.cc
index afd6adc..efff73a 100644
--- a/chrome/browser/policy/cloud/machine_level_user_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/machine_level_user_cloud_policy_browsertest.cc
@@ -306,7 +306,7 @@
CombinedSchemaRegistry schema_registry;
CloudPolicyStoreObserverStub observer;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
std::unique_ptr<MachineLevelUserCloudPolicyStore> policy_store =
MachineLevelUserCloudPolicyStore::Create(
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 63e05dfa..bb13e68 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -328,7 +328,8 @@
#endif
void GetTestDataDirectory(base::FilePath* test_data_directory) {
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, test_data_directory));
+ ASSERT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, test_data_directory));
}
// Filters requests to the hosts in |urls| and redirects them to the test data
diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc
index 2633e0ce..cbb7d63 100644
--- a/chrome/browser/policy/test/local_policy_test_server.cc
+++ b/chrome/browser/policy/test/local_policy_test_server.cc
@@ -76,7 +76,7 @@
// Read configuration from a file in chrome/test/data/policy.
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath source_root;
- CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
+ CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
config_file_ = source_root
.AppendASCII("chrome")
.AppendASCII("test")
@@ -189,7 +189,7 @@
// We need protobuf python bindings.
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;
}
@@ -225,7 +225,7 @@
base::FilePath* testserver_path) const {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath source_root;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &source_root)) {
+ if (!base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root)) {
LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
return false;
}
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index 3729c61..70f2870 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -47,7 +47,7 @@
public:
bool SetUpUserDataDirectory() override {
base::FilePath user_data_directory;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
original_pref_file_ = ui_test_utils::GetTestFilePath(
base::FilePath()
diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
index 2f76e46..7163747 100644
--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
@@ -80,7 +80,7 @@
}
base::FilePath profile_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
// Use a location under the real PreferenceMACs path so that the backup
// cleanup logic in ChromeTestLauncherDelegate::PreSharding() for interrupted
@@ -234,7 +234,7 @@
#endif
base::FilePath profile_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir);
// Sanity check that old protected pref file is never present in modern
@@ -339,7 +339,7 @@
base::FilePath num_tracked_prefs_file;
ASSERT_TRUE(
- PathService::Get(chrome::DIR_USER_DATA, &num_tracked_prefs_file));
+ base::PathService::Get(chrome::DIR_USER_DATA, &num_tracked_prefs_file));
num_tracked_prefs_file =
num_tracked_prefs_file.AppendASCII(kNumTrackedPrefFilename);
diff --git a/chrome/browser/printing/cloud_print/privet_http_unittest.cc b/chrome/browser/printing/cloud_print/privet_http_unittest.cc
index b38a906a..d7b19a7 100644
--- a/chrome/browser/printing/cloud_print/privet_http_unittest.cc
+++ b/chrome/browser/printing/cloud_print/privet_http_unittest.cc
@@ -1152,7 +1152,7 @@
std::make_unique<EmbeddedTestServer>(EmbeddedTestServer::TYPE_HTTP);
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
server_->ServeFilesFromDirectory(
test_data_dir.Append(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(server_->Start());
diff --git a/chrome/browser/printing/print_browsertest.cc b/chrome/browser/printing/print_browsertest.cc
index 6947a5b..970f22f 100644
--- a/chrome/browser/printing/print_browsertest.cc
+++ b/chrome/browser/printing/print_browsertest.cc
@@ -263,7 +263,7 @@
{
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
extension = LoadExtension(
test_data_dir.AppendASCII("printing").AppendASCII("test_extension"));
ASSERT_TRUE(extension);
diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc
index 983dea7..ab3c245 100644
--- a/chrome/browser/printing/printer_manager_dialog_win.cc
+++ b/chrome/browser/printing/printer_manager_dialog_win.cc
@@ -18,7 +18,7 @@
// A helper callback that opens the printer management dialog.
void OpenPrintersDialogCallback() {
base::FilePath sys_dir;
- PathService::Get(base::DIR_SYSTEM, &sys_dir);
+ base::PathService::Get(base::DIR_SYSTEM, &sys_dir);
base::FilePath rundll32 = sys_dir.Append(L"rundll32.exe");
base::FilePath shell32dll = sys_dir.Append(L"shell32.dll");
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index a6daff0..978a86f 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -46,7 +46,7 @@
public:
PrintingLayoutTest() {
base::FilePath browser_directory;
- PathService::Get(chrome::DIR_APP, &browser_directory);
+ base::PathService::Get(chrome::DIR_APP, &browser_directory);
emf_path_ = browser_directory.AppendASCII("metafile_dumps");
}
diff --git a/chrome/browser/printing/pwg_raster_converter_browsertest.cc b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
index 3021e459..790d604f 100644
--- a/chrome/browser/printing/pwg_raster_converter_browsertest.cc
+++ b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
@@ -45,7 +45,7 @@
void GetPdfData(const char* file_name,
base::FilePath* test_data_dir,
scoped_refptr<base::RefCountedString>* pdf_data) {
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, test_data_dir));
*test_data_dir = test_data_dir->AppendASCII("printing");
base::FilePath pdf_file = test_data_dir->AppendASCII(file_name);
std::string pdf_data_str;
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index 6240eef..ac8aa37 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -185,7 +185,7 @@
static const int kNbTries = 10;
int num_tries = 0;
base::FilePath program;
- ASSERT_TRUE(PathService::Get(base::FILE_EXE, &program));
+ ASSERT_TRUE(base::PathService::Get(base::FILE_EXE, &program));
base::FilePath::StringType exe_name = program.BaseName().value();
while (base::GetProcessCount(exe_name, &process_tree_filter) > 0 &&
num_tries++ < kNbTries) {
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index 1dffacdb..330ec23a 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -861,7 +861,7 @@
to_send.push_back(kTokenDelimiter);
base::FilePath current_dir;
- if (!PathService::Get(base::DIR_CURRENT, ¤t_dir))
+ if (!base::PathService::Get(base::DIR_CURRENT, ¤t_dir))
return PROCESS_NONE;
to_send.append(current_dir.value());
diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc
index fb13d5f8..e37702e 100644
--- a/chrome/browser/profile_resetter/profile_resetter.cc
+++ b/chrome/browser/profile_resetter/profile_resetter.cc
@@ -56,7 +56,7 @@
base::AssertBlockingAllowed();
// Get full path of chrome.
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe))
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe))
return;
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
for (int location = ShellUtil::SHORTCUT_LOCATION_FIRST;
@@ -355,7 +355,7 @@
base::AssertBlockingAllowed();
// Get full path of chrome.
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe))
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe))
return std::vector<ShortcutCommand>();
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
std::vector<ShortcutCommand> shortcuts;
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index 8da2ac4..57c8bb01 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -275,12 +275,12 @@
const base::string16& args) {
EXPECT_TRUE(shortcut_path_.empty());
base::FilePath path_to_create;
- EXPECT_TRUE(PathService::Get(base::DIR_USER_DESKTOP, &path_to_create));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_USER_DESKTOP, &path_to_create));
path_to_create = path_to_create.Append(name);
EXPECT_FALSE(base::PathExists(path_to_create)) << path_to_create.value();
base::FilePath path_exe;
- EXPECT_TRUE(PathService::Get(base::FILE_EXE, &path_exe));
+ EXPECT_TRUE(base::PathService::Get(base::FILE_EXE, &path_exe));
base::win::ShortcutProperties shortcut_properties;
shortcut_properties.set_target(path_exe);
shortcut_properties.set_arguments(args);
diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc
index 080230d..9cdd3a9 100644
--- a/chrome/browser/profiles/host_zoom_map_browsertest.cc
+++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc
@@ -185,7 +185,7 @@
}
base::FilePath user_data_directory, path_to_prefs;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
path_to_prefs = user_data_directory
.AppendASCII(TestingProfile::kTestUserProfileDir)
.Append(chrome::kPreferencesFilename);
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 9d77a6d..a3459df 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -158,7 +158,7 @@
false);
#endif
base::FilePath home;
- PathService::Get(base::DIR_HOME, &home);
+ base::PathService::Get(base::DIR_HOME, &home);
registry->RegisterStringPref(prefs::kSelectFileLastDirectory,
home.MaybeAsASCII());
#if !defined(OS_ANDROID)
diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
index 5b641a4..87ad4ac 100644
--- a/chrome/browser/profiles/profile_avatar_icon_util.cc
+++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
@@ -461,7 +461,7 @@
base::FilePath GetPathOfHighResAvatarAtIndex(size_t index) {
const char* file_name = GetDefaultAvatarIconFileNameAtIndex(index);
base::FilePath user_data_dir;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
return user_data_dir.AppendASCII(
kHighResAvatarFolderName).AppendASCII(file_name);
}
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 7616ff5..beb7eb0 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -887,6 +887,6 @@
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, LastSelectedDirectory) {
ProfileImpl* profile_impl = static_cast<ProfileImpl*>(browser()->profile());
base::FilePath home;
- PathService::Get(base::DIR_HOME, &home);
+ base::PathService::Get(base::DIR_HOME, &home);
ASSERT_EQ(profile_impl->last_selected_directory(), home);
}
\ No newline at end of file
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index f9d9362..556dd4cb 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -1313,7 +1313,7 @@
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::FilePath browser_directory;
- PathService::Get(base::DIR_CURRENT, &browser_directory);
+ base::PathService::Get(base::DIR_CURRENT, &browser_directory);
GURL home_page(url_formatter::FixupRelativeFile(
browser_directory,
command_line.GetSwitchValuePath(switches::kHomePage)));
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 208e426..2d884371 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -250,7 +250,8 @@
return false;
base::FilePath inspector_debug_dir;
- if (!PathService::Get(chrome::DIR_INSPECTOR_DEBUG, &inspector_debug_dir))
+ if (!base::PathService::Get(chrome::DIR_INSPECTOR_DEBUG,
+ &inspector_debug_dir))
return false;
DCHECK(!inspector_debug_dir.empty());
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index f479ebd4..fb608a7 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -411,7 +411,7 @@
EXPECT_TRUE(last_used_profile != NULL);
base::FilePath profile_path;
- PathService::Get(chrome::DIR_USER_DATA, &profile_path);
+ base::PathService::Get(chrome::DIR_USER_DATA, &profile_path);
profile_path = profile_path.AppendASCII(
std::string(chrome::kProfileDirPrefix) + "test-user-hash");
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index 1053a59..bc147f6 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -262,7 +262,7 @@
base::FilePath GetExePath() {
base::FilePath exe_path;
- EXPECT_TRUE(PathService::Get(base::FILE_EXE, &exe_path));
+ EXPECT_TRUE(base::PathService::Get(base::FILE_EXE, &exe_path));
return exe_path;
}
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
index 334d0f6..c807fce 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -492,7 +492,7 @@
}
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return;
}
@@ -586,7 +586,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return;
}
@@ -633,7 +633,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return false;
}
@@ -856,7 +856,7 @@
base::string16* name,
base::FilePath* icon_path) {
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return;
}
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index b7eca3c..b568c07 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -612,7 +612,7 @@
// Set up the server and get the test pages.
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
embedded_test_server()->ServeFilesFromDirectory(
test_data_dir.AppendASCII("chrome/test/data/"));
audio_url_ = embedded_test_server()->GetURL("/extensions/loop_audio.html");
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
index 543fe160..4aa35af 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
@@ -100,7 +100,7 @@
cleaner_command_line_.AppendSwitchASCII(chrome_cleaner::kChromeChannelSwitch,
base::IntToString(ChannelAsInt()));
base::FilePath chrome_exe_path;
- PathService::Get(base::FILE_EXE, &chrome_exe_path);
+ base::PathService::Get(base::FILE_EXE, &chrome_exe_path);
cleaner_command_line_.AppendSwitchPath(chrome_cleaner::kChromeExePathSwitch,
chrome_exe_path);
if (!InstallUtil::IsPerUserInstall())
diff --git a/chrome/browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc b/chrome/browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc
index 1450180e..853764f 100644
--- a/chrome/browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc
@@ -36,7 +36,7 @@
protected:
base::FilePath GetFilePath(const char* file_name) {
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
return test_data.AppendASCII("chrome")
.AppendASCII("safe_browsing_dmg")
.AppendASCII(file_name);
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
index 2ae80d2..6be228bd 100644
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
@@ -280,7 +280,7 @@
has_result_ = false;
base::FilePath source_path;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source_path));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_path));
testdata_path_ = source_path.AppendASCII("chrome")
.AppendASCII("test")
.AppendASCII("data")
@@ -1428,7 +1428,7 @@
net::URLRequestStatus::SUCCESS);
base::FilePath signed_dmg;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &signed_dmg));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &signed_dmg));
signed_dmg = signed_dmg.AppendASCII("safe_browsing")
.AppendASCII("mach_o")
.AppendASCII("signed-archive.dmg");
@@ -1451,7 +1451,8 @@
EXPECT_EQ(2215u, GetClientDownloadRequest()->udif_code_signature().length());
base::FilePath signed_dmg_signature;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &signed_dmg_signature));
+ EXPECT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, &signed_dmg_signature));
signed_dmg_signature = signed_dmg_signature.AppendASCII("safe_browsing")
.AppendASCII("mach_o")
.AppendASCII("signed-archive-signature.data");
@@ -1474,7 +1475,7 @@
net::URLRequestStatus::SUCCESS);
base::FilePath unsigned_dmg;
- EXPECT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &unsigned_dmg));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &unsigned_dmg));
unsigned_dmg = unsigned_dmg.AppendASCII("chrome")
.AppendASCII("safe_browsing_dmg")
.AppendASCII("mach_o_in_dmg.dmg");
@@ -1510,7 +1511,7 @@
net::URLRequestStatus::SUCCESS);
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
test_data = test_data.AppendASCII("chrome")
.AppendASCII("safe_browsing_dmg")
.AppendASCII("mach_o_in_dmg.txt");
@@ -1543,7 +1544,7 @@
net::URLRequestStatus::SUCCESS);
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &test_data));
test_data = test_data.AppendASCII("chrome")
.AppendASCII("safe_browsing_dmg")
.AppendASCII("mach_o_in_dmg_no_koly_signature.txt");
@@ -1576,7 +1577,7 @@
net::URLRequestStatus::SUCCESS);
base::FilePath unsigned_dmg;
- EXPECT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &unsigned_dmg));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_GEN_TEST_DATA, &unsigned_dmg));
unsigned_dmg = unsigned_dmg.AppendASCII("chrome")
.AppendASCII("safe_browsing_dmg")
.AppendASCII("mach_o_in_dmg.dmg");
diff --git a/chrome/browser/safe_browsing/download_protection/path_sanitizer.cc b/chrome/browser/safe_browsing/download_protection/path_sanitizer.cc
index b593ab0..f2da90f 100644
--- a/chrome/browser/safe_browsing/download_protection/path_sanitizer.cc
+++ b/chrome/browser/safe_browsing/download_protection/path_sanitizer.cc
@@ -11,7 +11,7 @@
PathSanitizer::PathSanitizer() {
// Get the home directory path.
- if (!PathService::Get(base::DIR_HOME, &home_path_))
+ if (!base::PathService::Get(base::DIR_HOME, &home_path_))
NOTREACHED();
}
diff --git a/chrome/browser/safe_browsing/download_protection/path_sanitizer_unittest.cc b/chrome/browser/safe_browsing/download_protection/path_sanitizer_unittest.cc
index e339dd7..f91fbfe9 100644
--- a/chrome/browser/safe_browsing/download_protection/path_sanitizer_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/path_sanitizer_unittest.cc
@@ -15,7 +15,7 @@
// Returns the root directory with a trailing separator. Works on all platforms.
base::FilePath GetRootDirectory() {
base::FilePath dir_temp;
- if (!PathService::Get(base::DIR_TEMP, &dir_temp))
+ if (!base::PathService::Get(base::DIR_TEMP, &dir_temp))
NOTREACHED();
std::vector<base::FilePath::StringType> components;
diff --git a/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc
index 822cd9b58..c176a62 100644
--- a/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc
@@ -53,7 +53,7 @@
base::FilePath GetTestFilePath() {
base::FilePath file_path;
- PathService::Get(base::DIR_SOURCE_ROOT, &file_path);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &file_path);
file_path = file_path.AppendASCII("net");
file_path = file_path.AppendASCII("data");
file_path = file_path.AppendASCII("url_request_unittest");
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc
index 01b9e0d5..c134711 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc
@@ -54,7 +54,7 @@
};
void BinaryIntegrityAnalyzerMacTest::SetUp() {
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
test_data_dir_ = test_data_dir_.Append("safe_browsing/mach_o/");
// Set up the temp directory to copy the bundle to.
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
index 5551091..e54d4a3e 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
@@ -34,7 +34,7 @@
// Find where chrome.exe is installed.
base::FilePath chrome_exe_dir;
- if (!PathService::Get(base::DIR_EXE, &chrome_exe_dir))
+ if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir))
NOTREACHED();
std::vector<base::FilePath> critical_binaries;
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
index 13c1681..7824dd1 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -65,7 +65,7 @@
// We retrieve DIR_TEST_DATA here because it is based on DIR_EXE and we are
// about to override the path to the latter.
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_))
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_))
NOTREACHED();
exe_dir_override_.reset(
diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc
index 90ffcfe..1a642ba 100644
--- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc
+++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc
@@ -23,7 +23,7 @@
bool LocalTwoPhaseTestServer::GetTestServerPath(
base::FilePath* testserver_path) const {
base::FilePath testserver_dir;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &testserver_dir)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &testserver_dir)) {
LOG(ERROR) << "Failed to get DIR_TEST_DATA";
return false;
}
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index ffe274d..de3f7b3 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -104,7 +104,7 @@
// static
base::FilePath SafeBrowsingService::GetBaseFilename() {
base::FilePath path;
- bool result = PathService::Get(chrome::DIR_USER_DATA, &path);
+ bool result = base::PathService::Get(chrome::DIR_USER_DATA, &path);
DCHECK(result);
return path.Append(safe_browsing::kSafeBrowsingBaseFilename);
}
@@ -139,7 +139,7 @@
FileTypePolicies::GetInstance();
base::FilePath user_data_dir;
- bool result = PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
DCHECK(result);
url_request_context_getter_ = new SafeBrowsingURLRequestContextGetter(
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index dd45c24..f1294054 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -789,7 +789,7 @@
void SetUpInProcessBrowserTestFixture() override {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->RegisterRequestHandler(
base::Bind(&HandleNeverCompletingRequests));
embedded_test_server()->RegisterRequestHandler(
@@ -2067,7 +2067,7 @@
EXPECT_FALSE(base::PathExists(cookie_path));
base::FilePath test_dir;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_dir)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir)) {
EXPECT_TRUE(false);
return false;
}
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
index b75e7c6..597c897 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc
@@ -758,7 +758,7 @@
// - Sub chunk kSubChunk1 containing kHash3.
const char kBasename[] = "FileStoreVersion7";
base::FilePath golden_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &golden_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &golden_path));
golden_path = golden_path.AppendASCII("SafeBrowsing");
golden_path = golden_path.AppendASCII(kBasename);
ASSERT_TRUE(base::CopyFile(golden_path, filename_));
@@ -792,7 +792,7 @@
// - Sub chunk kSubChunk1 containing kHash3.
const char kBasename[] = "FileStoreVersion8";
base::FilePath golden_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &golden_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &golden_path));
golden_path = golden_path.AppendASCII("SafeBrowsing");
golden_path = golden_path.AppendASCII(kBasename);
ASSERT_TRUE(base::CopyFile(golden_path, filename_));
diff --git a/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc b/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc
index aa3f72d..c8a56c0 100644
--- a/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc
+++ b/chrome/browser/safe_browsing/signature_evaluator_mac_unittest.cc
@@ -49,14 +49,14 @@
protected:
void SetUp() override {
base::FilePath source_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_path));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &source_path));
testdata_path_ =
source_path.AppendASCII("safe_browsing").AppendASCII("mach_o");
base::FilePath dir_exe;
- ASSERT_TRUE(PathService::Get(base::DIR_EXE, &dir_exe));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_EXE, &dir_exe));
base::FilePath file_exe;
- ASSERT_TRUE(PathService::Get(base::FILE_EXE, &file_exe));
+ ASSERT_TRUE(base::PathService::Get(base::FILE_EXE, &file_exe));
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
diff --git a/chrome/browser/search/local_files_ntp_source.cc b/chrome/browser/search/local_files_ntp_source.cc
index b7e98e7..d3d66ee 100644
--- a/chrome/browser/search/local_files_ntp_source.cc
+++ b/chrome/browser/search/local_files_ntp_source.cc
@@ -123,7 +123,7 @@
const std::string& origin,
const content::URLDataSource::GotDataCallback& callback) {
base::FilePath fullpath;
- PathService::Get(base::DIR_SOURCE_ROOT, &fullpath);
+ base::PathService::Get(base::DIR_SOURCE_ROOT, &fullpath);
fullpath = fullpath.AppendASCII(kBasePath).AppendASCII(path);
content::URLDataSource::GotDataCallback wrapper =
base::Bind(&CheckLocalIncludes, callback);
diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
index a6f00d5..e58a047 100644
--- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc
+++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
@@ -106,7 +106,7 @@
};
bool GetTestDataDir(base::FilePath* dir) {
- if (!PathService::Get(base::DIR_SOURCE_ROOT, dir))
+ if (!base::PathService::Get(base::DIR_SOURCE_ROOT, dir))
return false;
*dir = dir->AppendASCII("components")
.AppendASCII("test")
diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc
index bb78768..2d30e24 100644
--- a/chrome/browser/search_engines/template_url_parser_unittest.cc
+++ b/chrome/browser/search_engines/template_url_parser_unittest.cc
@@ -75,7 +75,7 @@
}
void TemplateURLParserTest::SetUp() {
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &osdd_dir_));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &osdd_dir_));
osdd_dir_ = osdd_dir_.AppendASCII("osdd");
ASSERT_TRUE(base::PathExists(osdd_dir_));
}
diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
index 0007d0f..ae7427b 100644
--- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc
+++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
@@ -57,7 +57,7 @@
std::unique_ptr<net::test_server::HttpResponse> SendResponse(
const net::test_server::HttpRequest& request) {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
base::FilePath index_file = test_data_dir.AppendASCII("template_url_scraper")
.AppendASCII("submit_handler")
.AppendASCII("index.html");
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index aed74498..aadc960 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -138,7 +138,7 @@
void SetUpCommandLine(base::CommandLine* command_line) override {
ServiceProcessControlBrowserTest::SetUpCommandLine(command_line);
base::FilePath exe;
- PathService::Get(base::DIR_EXE, &exe);
+ base::PathService::Get(base::DIR_EXE, &exe);
#if defined(OS_MACOSX)
exe = exe.DirName().DirName().DirName();
#endif
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 6f77acb..9e9afa3 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -112,7 +112,7 @@
test_files_.push_back("session_storage.html");
test_files_.push_back("subdomain_cookies.html");
- CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &test_file_dir_));
+ CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_file_dir_));
test_file_dir_ =
test_file_dir_.AppendASCII("chrome/test/data").AppendASCII(test_path_);
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index f00a684..8a3a105 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -99,7 +99,7 @@
std::string* chrome_version) {
// Get the path to the Chrome version.
base::FilePath chrome_dir;
- if (!PathService::Get(base::DIR_EXE, &chrome_dir))
+ if (!base::PathService::Get(base::DIR_EXE, &chrome_dir))
return false;
base::FilePath chrome_version_path = chrome_dir.Append(script);
@@ -333,7 +333,7 @@
DCHECK_EQ(shortcut_filename.BaseName().value(), shortcut_filename.value());
base::FilePath desktop_path;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
+ if (!base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
return false;
int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
@@ -557,7 +557,7 @@
// Just return the name of the executable path for Chrome.
base::FilePath chrome_exe_path;
- PathService::Get(base::FILE_EXE, &chrome_exe_path);
+ base::PathService::Get(base::FILE_EXE, &chrome_exe_path);
return chrome_exe_path;
}
@@ -669,7 +669,7 @@
const std::string& extension_id) {
base::FilePath desktop_path;
// If Get returns false, just leave desktop_path empty.
- PathService::Get(base::DIR_USER_DESKTOP, &desktop_path);
+ base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_path);
return GetExistingShortcutLocations(env, profile_path, extension_id,
desktop_path);
}
@@ -734,7 +734,7 @@
base::i18n::ReplaceIllegalCharactersInPath(&filename, '_');
base::FilePath desktop_path;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
+ if (!base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
return base::FilePath();
base::FilePath filepath = desktop_path.Append(filename);
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index d25a53c8..7f8f3e6a 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -150,11 +150,11 @@
// Get full path of chrome.
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe))
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe))
return;
base::FilePath pins_path;
- if (!PathService::Get(base::DIR_TASKBAR_PINS, &pins_path)) {
+ if (!base::PathService::Get(base::DIR_TASKBAR_PINS, &pins_path)) {
NOTREACHED();
return;
}
@@ -533,7 +533,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
LOG(ERROR) << "Error getting app exe path";
return false;
}
@@ -557,7 +557,7 @@
return false;
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
LOG(ERROR) << "Error getting app exe path";
return false;
}
@@ -637,7 +637,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED() << "Error getting app exe path";
return false;
}
@@ -657,7 +657,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED() << "Error getting app exe path";
on_finished_callback.Run();
return;
@@ -684,7 +684,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED() << "Error getting app exe path";
return false;
}
@@ -707,7 +707,7 @@
base::AssertBlockingAllowed();
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED() << "Error getting app exe path";
on_finished_callback.Run();
return;
diff --git a/chrome/browser/site_details_browsertest.cc b/chrome/browser/site_details_browsertest.cc
index 0eb9ec0..ca793026 100644
--- a/chrome/browser/site_details_browsertest.cc
+++ b/chrome/browser/site_details_browsertest.cc
@@ -177,7 +177,7 @@
// Add content/test/data so we can use cross_site_iframe_factory.html
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
embedded_test_server()->ServeFilesFromDirectory(
test_data_dir.AppendASCII("content/test/data/"));
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index aeb5838a..6a7fa0c 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -65,7 +65,7 @@
bool success = false;
#if defined(OS_WIN)
base::FilePath dict_dir;
- PathService::Get(chrome::DIR_USER_DATA, &dict_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &dict_dir);
base::FilePath fallback_file_path =
dict_dir.Append(path.BaseName());
bytes_written =
@@ -333,7 +333,7 @@
// Check if the dictionary exists in the fallback location. If so, use it
// rather than downloading anew.
base::FilePath user_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_dir);
base::FilePath fallback = user_dir.Append(path.BaseName());
if (!base::PathExists(path) && base::PathExists(fallback))
dictionary.path = fallback;
@@ -379,7 +379,7 @@
// sequence because it checks if there is a "Dictionaries" directory and
// create it.
base::FilePath dict_dir;
- PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir);
+ base::PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir);
base::FilePath dict_path =
spellcheck::GetVersionedFileName(language, dict_dir);
diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
index 9cd14b52..2ac4bc0 100644
--- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
+++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
@@ -431,7 +431,7 @@
// Write the corrupted BDICT data to create a corrupted BDICT file.
base::FilePath dict_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir));
base::FilePath bdict_path =
spellcheck::GetVersionedFileName("en-US", dict_dir);
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
index 0b9a48b..619f4b44 100644
--- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
+++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -1512,7 +1512,7 @@
// Prepare a file for the upload form.
base::FilePath file_path;
- EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &file_path));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_TEMP, &file_path));
file_path = file_path.AppendASCII("bar");
// Fill out the form to refer to the test file.
@@ -2448,7 +2448,7 @@
void SetUpOnMainThread() override {
base::FilePath serve_file;
- PathService::Get(chrome::DIR_TEST_DATA, &serve_file);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &serve_file);
serve_file = serve_file.Append(FILE_PATH_LITERAL("title1.html"));
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
@@ -2660,7 +2660,7 @@
// Prepare a file for the upload form.
base::FilePath file_path;
- EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &file_path));
+ EXPECT_TRUE(base::PathService::Get(base::DIR_TEMP, &file_path));
file_path = file_path.AppendASCII("bar");
// Fill out the form to refer to the test file.
diff --git a/chrome/browser/ssl/ssl_error_controller_client.cc b/chrome/browser/ssl/ssl_error_controller_client.cc
index 5bae65f..401e999 100644
--- a/chrome/browser/ssl/ssl_error_controller_client.cc
+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
@@ -105,7 +105,7 @@
#elif defined(OS_WIN)
base::FilePath path;
- PathService::Get(base::DIR_SYSTEM, &path);
+ base::PathService::Get(base::DIR_SYSTEM, &path);
static const base::char16 kControlPanelExe[] = L"control.exe";
path = path.Append(base::string16(kControlPanelExe));
base::CommandLine command(path);
diff --git a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc
index 9c1d2b1..8c77922 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc
@@ -65,7 +65,7 @@
->SetIsAfterStartupForTesting();
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
host_resolver()->AddSimulatedFailure("host-with-dns-lookup-failure");
@@ -73,7 +73,7 @@
content::SetupCrossSiteRedirector(embedded_test_server());
// Add content/test/data for cross_site_iframe_factory.html
- ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(content::DIR_TEST_DATA, &test_data_dir));
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 8520d819..9b046f50 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -144,7 +144,7 @@
base::FilePath GetBlacklistPath() {
base::FilePath blacklist_dir;
- PathService::Get(chrome::DIR_USER_DATA, &blacklist_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &blacklist_dir);
return blacklist_dir.AppendASCII(kBlacklistFilename);
}
diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
index cc1fc28b..7df4eb5 100644
--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -625,7 +625,7 @@
// Load a whitelist.
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
SupervisedUserWhitelistService* whitelist_service =
supervised_user_service->GetWhitelistService();
base::FilePath whitelist_path =
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc
index 03d1aa2..21e606f 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc
@@ -199,7 +199,7 @@
base::RunLoop run_loop;
site_lists_changed_callback_ = run_loop.QuitClosure();
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
base::FilePath whitelist_path =
test_data_dir.AppendASCII("whitelists/content_pack/site_list.json");
installer_->NotifyWhitelistReady("aaaa", base::ASCIIToUTF16("Title"),
diff --git a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
index d7e98119..3228f65 100644
--- a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
@@ -32,7 +32,7 @@
// Create and return an extension with the given path.
scoped_refptr<Extension> MakeExtension(const std::string& name) {
base::FilePath path;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &path));
path = path.AppendASCII(name);
base::DictionaryValue value;
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index edc0ede3..d9be41f 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -929,7 +929,7 @@
return gfx::Image();
base::FilePath full_path;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &full_path))
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &full_path))
return gfx::Image();
full_path = full_path.AppendASCII("sync").AppendASCII(path);
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index d0d2113d..9a8fa18 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -340,7 +340,7 @@
// about it. This is needed in tests such as supervised user cases which
// assume browser->profile() as the custodian profile.
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
if (!tmp_profile_paths_[index]->CreateUniqueTempDirUnderPath(
user_data_dir)) {
ADD_FAILURE();
@@ -557,7 +557,7 @@
// Create the verifier profile.
if (use_verifier_) {
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
profile_delegates_[num_clients_] =
std::make_unique<SyncProfileDelegate>(base::Callback<void(Profile*)>());
verifier_ = MakeTestProfile(
diff --git a/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc b/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
index 0b95fd67..08029a58 100644
--- a/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
+++ b/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
@@ -294,7 +294,7 @@
// Check that the task manager uses the specified favicon for the page.
base::FilePath test_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
std::string favicon_string;
{
base::ScopedAllowBlockingForTesting allow_blocking;
diff --git a/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc b/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc
index 78348437..3ffbed20 100644
--- a/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc
+++ b/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc
@@ -169,7 +169,7 @@
int buffer_size) {
// Calculate the number of bytes required for the structure, and ImageName.
base::FilePath current_exe;
- CHECK(PathService::Get(base::FILE_EXE, ¤t_exe));
+ CHECK(base::PathService::Get(base::FILE_EXE, ¤t_exe));
base::string16 image_name = current_exe.BaseName().value();
const int kImageNameBytes = image_name.length() * sizeof(base::char16);
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 8d1f3f3..535ef2ad 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -168,7 +168,7 @@
base::FilePath GetStarGazingPath() {
base::FilePath test_path;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
NOTREACHED();
return test_path;
}
@@ -184,7 +184,7 @@
base::FilePath GetHiDpiThemePath() {
base::FilePath test_path;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
NOTREACHED();
return test_path;
}
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index 909ae16..82720299 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -66,7 +66,7 @@
std::string LoadUnpackedThemeAt(const base::FilePath& temp_dir) {
base::FilePath dst_manifest_path = temp_dir.AppendASCII("manifest.json");
base::FilePath test_data_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
base::FilePath src_manifest_path =
test_data_dir.AppendASCII("extensions/theme_minimal/manifest.json");
EXPECT_TRUE(base::CopyFile(src_manifest_path, dst_manifest_path));
diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
index aaa63dc..47290cd5 100644
--- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
@@ -55,7 +55,8 @@
IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest,
UninstallSearchResult) {
base::FilePath test_extension_path;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path));
+ ASSERT_TRUE(
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path));
test_extension_path = test_extension_path.AppendASCII("extensions")
.AppendASCII("platform_apps")
.AppendASCII("minimal");
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client.cc b/chrome/browser/ui/ash/wallpaper_controller_client.cc
index c18cc079..07e9142b 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client.cc
@@ -450,13 +450,13 @@
// Get the paths of wallpaper directories.
base::FilePath user_data_path;
- CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_path));
+ CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_path));
base::FilePath chromeos_wallpapers_path;
- CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
- &chromeos_wallpapers_path));
+ CHECK(base::PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
+ &chromeos_wallpapers_path));
base::FilePath chromeos_custom_wallpapers_path;
- CHECK(PathService::Get(chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS,
- &chromeos_custom_wallpapers_path));
+ CHECK(base::PathService::Get(chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS,
+ &chromeos_custom_wallpapers_path));
wallpaper_controller_->Init(
std::move(client), user_data_path, chromeos_wallpapers_path,
diff --git a/chrome/browser/ui/ash/wallpaper_policy_handler.cc b/chrome/browser/ui/ash/wallpaper_policy_handler.cc
index 89410da3..f61c4d3 100644
--- a/chrome/browser/ui/ash/wallpaper_policy_handler.cc
+++ b/chrome/browser/ui/ash/wallpaper_policy_handler.cc
@@ -63,8 +63,8 @@
// Initialize the desired file path for device policy wallpaper. The path will
// be used by WallpaperController to access the wallpaper file.
base::FilePath chromeos_wallpapers_path;
- CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
- &chromeos_wallpapers_path));
+ CHECK(base::PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
+ &chromeos_wallpapers_path));
device_wallpaper_file_path_ =
chromeos_wallpapers_path.Append(kDeviceWallpaperDir)
.Append(kDeviceWallpaperFile);
diff --git a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
index aff9734..a98ca203 100644
--- a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
@@ -141,7 +141,7 @@
void SetUpOnMainThread() override {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
host_resolver()->AddRule("*", "127.0.0.1");
content::SetupCrossSiteRedirector(embedded_test_server());
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 254a583..807f907 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -185,7 +185,7 @@
explicit TestInterstitialPage(WebContents* tab) {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath file_path;
- bool success = PathService::Get(chrome::DIR_TEST_DATA, &file_path);
+ bool success = base::PathService::Get(chrome::DIR_TEST_DATA, &file_path);
EXPECT_TRUE(success);
file_path = file_path.AppendASCII("focus/typical_page.html");
success = base::ReadFileToString(file_path, &html_contents_);
diff --git a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm
index df2cb63..9e4f813f 100644
--- a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm
@@ -32,7 +32,7 @@
TEST_F(DownloadUtilMacTest, AddFileToPasteboardTest) {
// Get a download test file for addition to the pasteboard.
base::FilePath testPath;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &testPath));
+ ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &testPath));
base::FilePath testFile(FILE_PATH_LITERAL("download-test1.lib"));
testPath = testPath.Append(testFile);
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_views_cocoa.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_views_cocoa.mm
index c56c265..821f0f1e 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_views_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_views_cocoa.mm
@@ -67,7 +67,7 @@
if (!base::mac::FrameworkBundle()) {
// Look in the framework bundle for resources.
base::FilePath path;
- PathService::Get(base::DIR_EXE, &path);
+ base::PathService::Get(base::DIR_EXE, &path);
path = path.Append(chrome::kFrameworkName);
base::mac::SetOverrideFrameworkBundlePath(path);
}
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
index 6b1d185..3cb657b 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
@@ -23,7 +23,7 @@
scoped_refptr<Extension> extension;
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions")
.AppendASCII(extension_dir_name)
.AppendASCII(manifest_file);
@@ -53,7 +53,7 @@
gfx::Image LoadInstallPromptIcon() {
base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions")
.AppendASCII("install_prompt")
.AppendASCII("icon.png");
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index bd5ae5a..b6e35bf 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -155,7 +155,7 @@
// Load test icon from extension test directory.
SkBitmap LoadTestIcon() {
base::FilePath path;
- PathService::Get(chrome::DIR_TEST_DATA, &path);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions").AppendASCII("icon1.png");
std::string file_contents;
diff --git a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
index 15e246d5..43f37743 100644
--- a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
@@ -61,7 +61,7 @@
void SetUpOnMainThread() override {
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/ui/cocoa/test/cocoa_test_helper.mm b/chrome/browser/ui/cocoa/test/cocoa_test_helper.mm
index 0ab828f..8972330 100644
--- a/chrome/browser/ui/cocoa/test/cocoa_test_helper.mm
+++ b/chrome/browser/ui/cocoa/test/cocoa_test_helper.mm
@@ -17,7 +17,7 @@
void CocoaTest::BootstrapCocoa() {
// Look in the framework bundle for resources.
base::FilePath path;
- PathService::Get(base::DIR_EXE, &path);
+ base::PathService::Get(base::DIR_EXE, &path);
path = path.Append(chrome::kFrameworkName);
base::mac::SetOverrideFrameworkBundlePath(path);
}
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc
index 39a20e38..c43ef29 100644
--- a/chrome/browser/ui/global_error/global_error_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -57,7 +57,7 @@
base::FilePath crx_path = temp_dir->GetPath().AppendASCII("temp.crx");
base::FilePath test_data;
- EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data));
test_data = test_data.AppendASCII("extensions");
base::FilePath dir_path = test_data.AppendASCII(extension_folder);
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
index 0f7b7e6..d7d0279 100644
--- a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
+++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
@@ -51,7 +51,7 @@
base::FilePath GetResourceFile(base::FilePath::StringPieceType relative_path) {
base::FilePath base_dir;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &base_dir))
+ if (!base::PathService::Get(chrome::DIR_TEST_DATA, &base_dir))
return base::FilePath();
base::FilePath full_path =
base_dir.Append(kResourcePath).Append(relative_path);
diff --git a/chrome/browser/ui/passwords/password_manager_porter.cc b/chrome/browser/ui/passwords/password_manager_porter.cc
index 751f337..ddd5dfb6 100644
--- a/chrome/browser/ui/passwords/password_manager_porter.cc
+++ b/chrome/browser/ui/passwords/password_manager_porter.cc
@@ -49,7 +49,7 @@
base::FilePath GetDefaultFilepathForPasswordFile(
const base::FilePath::StringType& default_extension) {
base::FilePath default_path;
- PathService::Get(chrome::DIR_USER_DOCUMENTS, &default_path);
+ base::PathService::Get(chrome::DIR_USER_DOCUMENTS, &default_path);
#if defined(OS_WIN)
base::string16 file_name =
l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_DEFAULT_EXPORT_FILENAME);
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
index f3a78bd..ef8f838 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
@@ -18,7 +18,7 @@
protected:
virtual base::FilePath GetPreferencesFilePath() {
base::FilePath test_data_directory;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory);
return test_data_directory
.AppendASCII("profiles")
.AppendASCII("web_prefs")
@@ -28,7 +28,7 @@
bool SetUpUserDataDirectory() override {
base::FilePath user_data_directory;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
base::FilePath default_profile =
user_data_directory.AppendASCII(TestingProfile::kTestUserProfileDir);
if (!base::CreateDirectory(default_profile)) {
diff --git a/chrome/browser/ui/profile_error_browsertest.cc b/chrome/browser/ui/profile_error_browsertest.cc
index 09c2333e..74baf84 100644
--- a/chrome/browser/ui/profile_error_browsertest.cc
+++ b/chrome/browser/ui/profile_error_browsertest.cc
@@ -33,7 +33,7 @@
bool SetUpUserDataDirectory() override {
base::FilePath profile_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &profile_dir)) {
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &profile_dir)) {
ADD_FAILURE();
return false;
}
diff --git a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
index bfffd91..8859215 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
@@ -117,7 +117,7 @@
bool DeleteProfileData(const std::string& basepath) {
base::FilePath user_data_dir;
- if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
return false;
base::FilePath dir_to_delete = user_data_dir.AppendASCII(basepath);
@@ -127,7 +127,7 @@
bool RemoveCreateDirectoryPermissionForUserDataDirectory() {
base::FilePath user_data_dir;
- return PathService::Get(chrome::DIR_USER_DATA, &user_data_dir) &&
+ return base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir) &&
base::DenyFilePermission(user_data_dir, FILE_ADD_SUBDIRECTORY);
}
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
index 6fa05a0..157755c 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
@@ -236,7 +236,7 @@
void ShowUi(const std::string& name) override {
extensions::ChromeTestExtensionLoader loader(browser()->profile());
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
scoped_refptr<const extensions::Extension> extension = loader.LoadExtension(
test_data_dir.AppendASCII("extensions/uitest/long_name"));
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
index c35a1bac..f5874f8 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -69,7 +69,7 @@
Profile* CreateTestingProfile(const std::string& profile_name) {
base::FilePath path;
- PathService::Get(chrome::DIR_USER_DATA, &path);
+ base::PathService::Get(chrome::DIR_USER_DATA, &path);
path = path.AppendASCII(profile_name);
return CreateTestingProfile(path);
}
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index fd53233..dd1ac5d 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -110,7 +110,7 @@
// We have to provide at least one mount point.
// File manager looks for "Downloads" mount point, so use this name.
base::FilePath tmp_path;
- PathService::Get(base::DIR_TEMP, &tmp_path);
+ base::PathService::Get(base::DIR_TEMP, &tmp_path);
ASSERT_TRUE(tmp_dir_.CreateUniqueTempDirUnderPath(tmp_path));
downloads_dir_ = tmp_dir_.GetPath().Append("Downloads");
base::CreateDirectory(downloads_dir_);
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index 374c39e..6d07db3 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -32,7 +32,7 @@
: policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS |
TestManagementPolicyProvider::MUST_REMAIN_ENABLED |
TestManagementPolicyProvider::MUST_REMAIN_INSTALLED) {
- CHECK(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
+ CHECK(base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
test_data_dir_ = test_data_dir_.AppendASCII("extensions");
}
diff --git a/chrome/browser/ui/webui/memory_internals_ui.cc b/chrome/browser/ui/webui/memory_internals_ui.cc
index 60437aa..b2cb6b6 100644
--- a/chrome/browser/ui/webui/memory_internals_ui.cc
+++ b/chrome/browser/ui/webui/memory_internals_ui.cc
@@ -217,7 +217,7 @@
// TODO(bug 757115) Does it make sense to show the Android file picker here
// instead? Need to test what that looks like.
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
base::FilePath output_path = user_data_dir.Append(default_file);
ProfilingProcessHost::GetInstance()->SaveTraceWithHeapDumpToFile(
std::move(output_path),
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index 153107f0..2a5b223 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -259,7 +259,8 @@
// Obtain the version of the PNaCl translator.
base::FilePath pnacl_path;
- bool got_path = PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
+ bool got_path =
+ base::PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
if (!got_path || pnacl_path.empty() || !pnacl_path_exists_) {
AddPair(list,
ASCIIToUTF16("PNaCl translator"),
@@ -344,7 +345,8 @@
bool CheckPathAndVersion(std::string* version) {
base::FilePath pnacl_path;
- bool got_path = PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
+ bool got_path =
+ base::PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_path);
if (got_path && !pnacl_path.empty() && base::PathExists(pnacl_path)) {
CheckVersion(pnacl_path, version);
return true;
diff --git a/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc b/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
index eb0d7ef..d0c9dad 100644
--- a/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
@@ -94,7 +94,7 @@
base::FilePath PolicyToolUITest::GetSessionsDir() {
base::FilePath profile_dir;
- EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
+ EXPECT_TRUE(base::PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
return profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir)
.Append(kPolicyToolSessionsDir);
}
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index 578bbdb..d62f3fb 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -149,7 +149,7 @@
std::make_unique<ChromeSelectFilePolicy>(web_ui()->GetWebContents()));
base::FilePath downloads_path;
- if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path)) {
+ if (!base::PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path)) {
NOTREACHED();
return;
}
diff --git a/chrome/browser/ui/webui/settings_utils_win.cc b/chrome/browser/ui/webui/settings_utils_win.cc
index 7badcf5..4445cee 100644
--- a/chrome/browser/ui/webui/settings_utils_win.cc
+++ b/chrome/browser/ui/webui/settings_utils_win.cc
@@ -76,15 +76,15 @@
// new dialog to be made for each call. rundll32 uses the same global
// dialog and it seems to share with the shortcut in control panel.
base::FilePath rundll32;
- PathService::Get(base::DIR_SYSTEM, &rundll32);
+ base::PathService::Get(base::DIR_SYSTEM, &rundll32);
rundll32 = rundll32.AppendASCII("rundll32.exe");
base::FilePath shell32dll;
- PathService::Get(base::DIR_SYSTEM, &shell32dll);
+ base::PathService::Get(base::DIR_SYSTEM, &shell32dll);
shell32dll = shell32dll.AppendASCII("shell32.dll");
base::FilePath inetcpl;
- PathService::Get(base::DIR_SYSTEM, &inetcpl);
+ base::PathService::Get(base::DIR_SYSTEM, &inetcpl);
inetcpl = inetcpl.AppendASCII("inetcpl.cpl,,4");
std::wstring args(shell32dll.value());
diff --git a/chrome/browser/ui/webui/test_files_request_filter.cc b/chrome/browser/ui/webui/test_files_request_filter.cc
index b9604f3..e4cdc784 100644
--- a/chrome/browser/ui/webui/test_files_request_filter.cc
+++ b/chrome/browser/ui/webui/test_files_request_filter.cc
@@ -25,7 +25,7 @@
std::string contents;
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
if (!base::ReadFileToString(
test_data_dir.AppendASCII("webui").AppendASCII(url_substr[1]),
&contents))
diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc
index 1c31268e..ae7ad188 100644
--- a/chrome/browser/ui/webui/webui_webview_browsertest.cc
+++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc
@@ -110,7 +110,7 @@
base::FilePath(FILE_PATH_LITERAL("webview_basic.js")));
base::FilePath test_data_dir;
- PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
+ base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
ASSERT_TRUE(embedded_test_server()->Start());
}
diff --git a/chrome/browser/vr/test/paths.cc b/chrome/browser/vr/test/paths.cc
index 068921f..8b129c74 100644
--- a/chrome/browser/vr/test/paths.cc
+++ b/chrome/browser/vr/test/paths.cc
@@ -13,7 +13,7 @@
void GetTestDataPath(base::FilePath* result) {
base::FilePath path;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
+ ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &path));
path = path.Append(FILE_PATH_LITERAL("chrome"))
.Append(FILE_PATH_LITERAL("browser"))
.Append(FILE_PATH_LITERAL("vr"))
diff --git a/chrome/browser/vr/test/vr_test_suite.cc b/chrome/browser/vr/test/vr_test_suite.cc
index df5fa72..bf5a4761 100644
--- a/chrome/browser/vr/test/vr_test_suite.cc
+++ b/chrome/browser/vr/test/vr_test_suite.cc
@@ -33,9 +33,9 @@
base::FilePath pak_path;
#if defined(OS_ANDROID)
ui::RegisterPathProvider();
- PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
+ base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
#else
- PathService::Get(base::DIR_MODULE, &pak_path);
+ base::PathService::Get(base::DIR_MODULE, &pak_path);
#endif
ui::ResourceBundle::InitSharedInstanceWithPakPath(
pak_path.AppendASCII("vr_test.pak"));
diff --git a/chrome/browser/vr/testapp/test_keyboard_renderer.cc b/chrome/browser/vr/testapp/test_keyboard_renderer.cc
index 5f5140e..2233ae3 100644
--- a/chrome/browser/vr/testapp/test_keyboard_renderer.cc
+++ b/chrome/browser/vr/testapp/test_keyboard_renderer.cc
@@ -29,7 +29,7 @@
// is provided by the physical keyboard.
// Read and decode keyboard image.
base::FilePath dir;
- PathService::Get(base::DIR_CURRENT, &dir);
+ base::PathService::Get(base::DIR_CURRENT, &dir);
dir = dir.Append(base::FilePath().AppendASCII(kKeyboardImagePath));
DCHECK(base::PathExists(dir));
std::string file_contents;
diff --git a/chrome/browser/vr/testapp/vr_test_context.cc b/chrome/browser/vr/testapp/vr_test_context.cc
index aff4cfe..675d766b 100644
--- a/chrome/browser/vr/testapp/vr_test_context.cc
+++ b/chrome/browser/vr/testapp/vr_test_context.cc
@@ -79,7 +79,7 @@
VrTestContext::VrTestContext() : view_scale_factor_(kDefaultViewScaleFactor) {
base::FilePath pak_path;
- PathService::Get(base::DIR_MODULE, &pak_path);
+ base::PathService::Get(base::DIR_MODULE, &pak_path);
ui::ResourceBundle::InitSharedInstanceWithPakPath(
pak_path.AppendASCII("vr_testapp.pak"));
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
index 0c27520..59150ce3 100644
--- a/chrome/browser/web_applications/web_app_mac.mm
+++ b/chrome/browser/web_applications/web_app_mac.mm
@@ -209,7 +209,7 @@
bool HasSameUserDataDir(const base::FilePath& bundle_path) {
NSDictionary* plist = ReadPlist(GetPlistPath(bundle_path));
base::FilePath user_data_dir;
- PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+ base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
DCHECK(!user_data_dir.empty());
return base::StartsWith(
base::SysNSStringToUTF8(
diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm
index b8ee531..c6078b3 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -236,9 +236,9 @@
}
TEST_F(WebAppShortcutCreatorTest, DeleteShortcuts) {
- // When using PathService::Override, it calls base::MakeAbsoluteFilePath.
- // On Mac this prepends "/private" to the path, but points to the same
- // directory in the file system.
+ // When using base::PathService::Override, it calls
+ // base::MakeAbsoluteFilePath. On Mac this prepends "/private" to the path,
+ // but points to the same directory in the file system.
app_data_dir_ = base::MakeAbsoluteFilePath(app_data_dir_);
base::ScopedTempDir other_folder_temp_dir;
@@ -277,7 +277,8 @@
[plist writeToFile:plist_path
atomically:YES];
- EXPECT_TRUE(PathService::Override(chrome::DIR_USER_DATA, app_data_dir_));
+ EXPECT_TRUE(
+ base::PathService::Override(chrome::DIR_USER_DATA, app_data_dir_));
shortcut_creator.DeleteShortcuts();
EXPECT_FALSE(base::PathExists(internal_shim_path_));
EXPECT_TRUE(base::PathExists(shim_path_));
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index c414fd6a..218f41d 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -188,7 +188,7 @@
}
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return false;
}
@@ -343,7 +343,7 @@
shortcut_info.profile_path);
base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return;
}
diff --git a/chrome/browser/win/browser_util.cc b/chrome/browser/win/browser_util.cc
index 09565896..f64cc0d 100644
--- a/chrome/browser/win/browser_util.cc
+++ b/chrome/browser/win/browser_util.cc
@@ -18,7 +18,7 @@
bool IsBrowserAlreadyRunning() {
static HANDLE handle = NULL;
base::FilePath exe_path;
- PathService::Get(base::FILE_EXE, &exe_path);
+ base::PathService::Get(base::FILE_EXE, &exe_path);
std::wstring exe = exe_path.value();
std::replace(exe.begin(), exe.end(), '\\', '!');
std::transform(exe.begin(), exe.end(), exe.begin(), tolower);
diff --git a/chrome/browser/win/jumplist.cc b/chrome/browser/win/jumplist.cc
index 5da989c..1a1d4d0 100644
--- a/chrome/browser/win/jumplist.cc
+++ b/chrome/browser/win/jumplist.cc
@@ -154,7 +154,7 @@
JumpListUpdater* jumplist_updater,
IncognitoModePrefs::Availability incognito_availability) {
base::FilePath chrome_path;
- if (!PathService::Get(base::FILE_EXE, &chrome_path))
+ if (!base::PathService::Get(base::FILE_EXE, &chrome_path))
return false;
int icon_index = install_static::GetIconResourceIndex();
diff --git a/chrome/browser/win/jumplist_updater.cc b/chrome/browser/win/jumplist_updater.cc
index 86eedd5..32c4105 100644
--- a/chrome/browser/win/jumplist_updater.cc
+++ b/chrome/browser/win/jumplist_updater.cc
@@ -163,7 +163,7 @@
// Retrieve the absolute path to "chrome.exe".
base::FilePath application_path;
- if (!PathService::Get(base::FILE_EXE, &application_path))
+ if (!base::PathService::Get(base::FILE_EXE, &application_path))
return false;
// Create an EnumerableObjectCollection object to be added items of the
@@ -202,7 +202,7 @@
// Retrieve the absolute path to "chrome.exe".
base::FilePath application_path;
- if (!PathService::Get(base::FILE_EXE, &application_path))
+ if (!base::PathService::Get(base::FILE_EXE, &application_path))
return false;
// Exit this function when the given vector does not contain any items
