diff options
Diffstat (limited to 'cloud_print/virtual_driver')
3 files changed, 8 insertions, 8 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 510370f..740b2f2 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -156,9 +156,9 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) { return HRESULT_FROM_WIN32(exit_code); } } else { - if (!base::Delete(target_path, false)) { + if (!base::DeleteFile(target_path, false)) { SpoolerServiceCommand("stop"); - bool deleted = base::Delete(target_path, false); + bool deleted = base::DeleteFile(target_path, false); SpoolerServiceCommand("start"); if(!deleted) { @@ -480,7 +480,7 @@ HRESULT DoDelete(const base::FilePath& install_path) { if (!base::DirectoryExists(install_path)) return S_FALSE; Sleep(5000); // Give parent some time to exit. - return base::Delete(install_path, true) ? S_OK : E_FAIL; + return base::DeleteFile(install_path, true) ? S_OK : E_FAIL; } HRESULT DoInstall(const base::FilePath& install_path) { @@ -493,7 +493,7 @@ HRESULT DoInstall(const base::FilePath& install_path) { if (!old_install_path.value().empty() && install_path != old_install_path) { if (base::DirectoryExists(old_install_path)) - base::Delete(old_install_path, true); + base::DeleteFile(old_install_path, true); } CreateUninstallKey(kUninstallId, LoadLocalString(IDS_DRIVER_NAME), kUninstallSwitch); 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 ab235e6..f71bb3f 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -125,7 +125,7 @@ void DeleteLeakedFiles(const base::FilePath& dir) { for (base::FilePath file_path = enumerator.Next(); !file_path.empty(); file_path = enumerator.Next()) { if (enumerator.GetInfo().GetLastModifiedTime() < delete_before) - base::Delete(file_path, false); + base::DeleteFile(file_path, false); } } @@ -503,7 +503,7 @@ BOOL WINAPI Monitor2EndDocPort(HANDLE port_handle) { } } if (delete_file) - base::Delete(port_data->file_path, false); + base::DeleteFile(port_data->file_path, false); } if (port_data->printer_handle != NULL) { // Tell the spooler that the job is complete. 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 cce0327..0e32027 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 @@ -74,10 +74,10 @@ class PortMonitorTest : public testing::Test { base::FilePath path; PathService::Get(base::DIR_LOCAL_APP_DATA, &path); base::FilePath main_path = path.Append(kChromeExePath); - ASSERT_TRUE(base::Delete(main_path, true)); + ASSERT_TRUE(base::DeleteFile(main_path, true)); PathService::Get(base::DIR_LOCAL_APP_DATA, &path); base::FilePath alternate_path = path.Append(kAlternateChromeExePath); - ASSERT_TRUE(base::Delete(alternate_path, true)); + ASSERT_TRUE(base::DeleteFile(alternate_path, true)); } protected: |