diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
commit | 7567484144da059e2c2c2a818b06660a5459052f (patch) | |
tree | a4ceafc7e890051c25dbdd54b170d0f5794dd229 /cloud_print | |
parent | 8a25d54d6eb190a8b82479b5309a892c1080a372 (diff) | |
download | chromium_src-7567484144da059e2c2c2a818b06660a5459052f.zip chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.gz chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.bz2 |
Move PathExists to base namespace.
BUG=
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/18286004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
6 files changed, 11 insertions, 11 deletions
diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc index e67d5a2..c4b35e4 100644 --- a/cloud_print/service/win/service_controller.cc +++ b/cloud_print/service/win/service_controller.cc @@ -162,7 +162,7 @@ HRESULT ServiceController::InstallService(const string16& user, return hr; base::FilePath service_path = GetBinary(); - if (!file_util::PathExists(service_path)) + if (!base::PathExists(service_path)) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); CommandLine command_line(service_path); command_line.AppendSwitch(run_switch); @@ -246,7 +246,7 @@ HRESULT ServiceController::UpdateBinaryPath() { return hr; base::FilePath service_path = GetBinary(); - if (!file_util::PathExists(service_path)) + if (!base::PathExists(service_path)) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); command_line_.SetProgram(service_path); diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc index 51d9c93..2b35b62 100644 --- a/cloud_print/service/win/service_listener.cc +++ b/cloud_print/service/win/service_listener.cc @@ -40,7 +40,7 @@ std::string GetEnvironment(const base::FilePath& user_data_dir) { if (file_util::CreateDirectory(user_data_dir)) { base::FilePath temp_file; if (file_util::CreateTemporaryFileInDir(user_data_dir, &temp_file)) { - DCHECK(file_util::PathExists(temp_file)); + DCHECK(base::PathExists(temp_file)); environment.SetString(SetupListener::kUserDataDirJsonValueName, user_data_dir.value()); base::Delete(temp_file, false); diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 85591ee..e5a249e 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -116,7 +116,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) { source_path.value() << " to " << target_path.value(); return GetLastHResult(); } - } else if (!file_util::PathExists(target_path)) { + } else if (!base::PathExists(target_path)) { // Already removed. Just "succeed" silently. return S_OK; } @@ -237,9 +237,9 @@ void ReadyDriverDependencies(const base::FilePath& destination) { driver_cache_path = driver_cache_path.Append(L"Driver Cache\\i386"); for (size_t i = 0; i < arraysize(kDependencyList); ++i) { base::FilePath dst_path = destination.Append(kDependencyList[i]); - if (!file_util::PathExists(dst_path)) { + if (!base::PathExists(dst_path)) { base::FilePath src_path = driver_cache_path.Append(kDependencyList[i]); - if (!file_util::PathExists(src_path)) + if (!base::PathExists(src_path)) src_path = GetSystemPath(kDependencyList[i]); base::CopyFile(src_path, dst_path); } @@ -257,7 +257,7 @@ HRESULT InstallDriver(const base::FilePath& install_path) { // Add all files. AddPrinterDriverEx will removes unnecessary. for (size_t i = 0; i < arraysize(kDependencyList); ++i) { base::FilePath file_path = temp_path.path().Append(kDependencyList[i]); - if (file_util::PathExists(file_path)) + if (base::PathExists(file_path)) dependent_array.push_back(file_path.value()); else LOG(WARNING) << "File is missing: " << file_path.BaseName().value(); @@ -269,7 +269,7 @@ HRESULT InstallDriver(const base::FilePath& install_path) { base::FilePath ui_path = temp_path.path().Append(kUiDriverName); base::FilePath ui_help_path = temp_path.path().Append(kHelpName); - if (!file_util::PathExists(xps_path)) { + if (!base::PathExists(xps_path)) { SetGoogleUpdateError(kGoogleUpdateProductId, LoadLocalString(IDS_ERROR_NO_XPS)); return HRESULT_FROM_WIN32(ERROR_BAD_DRIVER); diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index 657cfef..ad43c8f 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -288,7 +288,7 @@ base::FilePath ReadPathFromRegistry(HKEY root, const wchar_t* path_name) { base::win::RegKey gcp_key(HKEY_CURRENT_USER, kCloudPrintRegKey, KEY_READ); string16 data; if (SUCCEEDED(gcp_key.ReadValue(path_name, &data)) && - file_util::PathExists(base::FilePath(data))) { + base::PathExists(base::FilePath(data))) { return base::FilePath(data); } return base::FilePath(); diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc index 6bc5962..6790a78 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc @@ -45,7 +45,7 @@ bool XpsIsInstalled() { return false; } xps_path = xps_path.Append(L"mxdwdrv.dll"); - if (!file_util::PathExists(xps_path)) { + if (!base::PathExists(xps_path)) { return false; } return true; diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index 985b386..4849842 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc @@ -99,7 +99,7 @@ TEST_F(PortMonitorTest, GetChromeExePathTest) { EXPECT_FALSE(chrome_path.empty()); EXPECT_TRUE( chrome_path.value().rfind(kAlternateChromeExePath) != std::string::npos); - EXPECT_TRUE(file_util::PathExists(chrome_path)); + EXPECT_TRUE(base::PathExists(chrome_path)); DeleteChromeExeRegistry(); chrome_path = cloud_print::GetChromeExePath(); // No Chrome or regular chrome path. |