summaryrefslogtreecommitdiffstats
path: root/chrome/browser/component_updater
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/component_updater')
-rw-r--r--chrome/browser/component_updater/component_unpacker.cc6
-rw-r--r--chrome/browser/component_updater/component_updater_service.cc2
-rw-r--r--chrome/browser/component_updater/pepper_flash_component_installer.cc2
-rw-r--r--chrome/browser/component_updater/pnacl/pnacl_component_installer.cc2
-rw-r--r--chrome/browser/component_updater/swiftshader_component_installer.cc2
-rw-r--r--chrome/browser/component_updater/test/test_installer.cc4
-rw-r--r--chrome/browser/component_updater/widevine_cdm_component_installer.cc4
7 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/component_updater/component_unpacker.cc b/chrome/browser/component_updater/component_unpacker.cc
index 341df22..de7cfcb 100644
--- a/chrome/browser/component_updater/component_unpacker.cc
+++ b/chrome/browser/component_updater/component_unpacker.cc
@@ -110,7 +110,7 @@ base::DictionaryValue* ReadManifest(const base::FilePath& unpack_path) {
// being inserted into the target directory by another process or thread.
bool MakeEmptyDirectory(const base::FilePath& path) {
if (file_util::PathExists(path)) {
- if (!file_util::Delete(path, true))
+ if (!base::Delete(path, true))
return false;
}
if (!file_util::CreateDirectory(path))
@@ -186,7 +186,7 @@ ComponentUnpacker::ComponentUnpacker(const std::vector<uint8>& pk_hash,
patcher,
installer,
&extended_error_);
- file_util::Delete(unpack_diff_path, true);
+ base::Delete(unpack_diff_path, true);
unpack_diff_path.clear();
error_ = result;
if (error_ != kNone) {
@@ -223,5 +223,5 @@ ComponentUnpacker::ComponentUnpacker(const std::vector<uint8>& pk_hash,
ComponentUnpacker::~ComponentUnpacker() {
if (!unpack_path_.empty())
- file_util::Delete(unpack_path_, true);
+ base::Delete(unpack_path_, true);
}
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index 6ceb452..8048855 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -929,7 +929,7 @@ void CrxUpdateService::Install(const CRXContext* context,
context->fingerprint,
component_patcher_.get(),
context->installer);
- if (!file_util::Delete(crx_path, false))
+ if (!base::Delete(crx_path, false))
NOTREACHED() << crx_path.value();
// Why unretained? See comment at top of file.
BrowserThread::PostDelayedTask(
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 009afa0..2b07c40 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -385,7 +385,7 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
// Remove older versions of Pepper Flash.
for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
iter != older_dirs.end(); ++iter) {
- file_util::Delete(*iter, true);
+ base::Delete(*iter, true);
}
}
#endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
index adfde80..c608c35 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
@@ -415,7 +415,7 @@ void StartPnaclUpdateRegistration(PnaclComponentInstaller* pci) {
// Remove older versions of PNaCl.
for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
iter != older_dirs.end(); ++iter) {
- file_util::Delete(*iter, true);
+ base::Delete(*iter, true);
}
}
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
index 5c2eca8..b4a4650 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -230,7 +230,7 @@ void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
// Remove older versions of SwiftShader.
for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
iter != older_dirs.end(); ++iter) {
- file_util::Delete(*iter, true);
+ base::Delete(*iter, true);
}
}
diff --git a/chrome/browser/component_updater/test/test_installer.cc b/chrome/browser/component_updater/test/test_installer.cc
index 9a4098c..2dc2913 100644
--- a/chrome/browser/component_updater/test/test_installer.cc
+++ b/chrome/browser/component_updater/test/test_installer.cc
@@ -19,7 +19,7 @@ void TestInstaller::OnUpdateError(int error) {
bool TestInstaller::Install(const base::DictionaryValue& manifest,
const base::FilePath& unpack_path) {
++install_count_;
- return file_util::Delete(unpack_path, true);
+ return base::Delete(unpack_path, true);
}
bool TestInstaller::GetInstalledFile(const std::string& file,
@@ -52,7 +52,7 @@ VersionedTestInstaller::VersionedTestInstaller() {
}
VersionedTestInstaller::~VersionedTestInstaller() {
- file_util::Delete(install_directory_, true);
+ base::Delete(install_directory_, true);
}
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index a9c084c..0b1c1b0 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -302,7 +302,7 @@ void StartWidevineCdmUpdateRegistration(ComponentUpdateService* cus) {
BrowserThread::UI, FROM_HERE,
base::Bind(&RegisterWidevineCdmWithChrome, adapter_path, version));
} else {
- file_util::Delete(latest_dir, true);
+ base::Delete(latest_dir, true);
version = base::Version(kNullVersion);
}
}
@@ -314,7 +314,7 @@ void StartWidevineCdmUpdateRegistration(ComponentUpdateService* cus) {
// Remove older versions of Widevine CDM.
for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
iter != older_dirs.end(); ++iter) {
- file_util::Delete(*iter, true);
+ base::Delete(*iter, true);
}
}