summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 04:13:43 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 04:13:43 +0000
commitd33a8db25ae978510797a5f20a050046827c12ab (patch)
treef3891a50a4192d86aacd4cab92d516039c08d12c /base
parent1fcef6a23fb3e14345f7a918d5ab90bb3d2a2ade (diff)
downloadchromium_src-d33a8db25ae978510797a5f20a050046827c12ab.zip
chromium_src-d33a8db25ae978510797a5f20a050046827c12ab.tar.gz
chromium_src-d33a8db25ae978510797a5f20a050046827c12ab.tar.bz2
Re-disable all the ExtensionUnpacker test pending new ideas. As Alexi pointed out, my change does nothing.
BUG=108724 Review URL: https://chromiumcodereview.appspot.com/9310116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util_win.cc1
-rw-r--r--base/scoped_temp_dir.cc2
2 files changed, 0 insertions, 3 deletions
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 173cc39..4723b96 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -108,7 +108,6 @@ bool Delete(const FilePath& path, bool recursive) {
SHFILEOPSTRUCT file_operation = {0};
file_operation.wFunc = FO_DELETE;
file_operation.pFrom = double_terminated_path;
- file_operation.pTo = NULL; // Must be NULL according to documentation.
file_operation.fFlags = FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION;
if (!recursive)
file_operation.fFlags |= FOF_NORECURSION | FOF_FILESONLY;
diff --git a/base/scoped_temp_dir.cc b/base/scoped_temp_dir.cc
index 6af4d75..2349d60 100644
--- a/base/scoped_temp_dir.cc
+++ b/base/scoped_temp_dir.cc
@@ -63,9 +63,7 @@ bool ScopedTempDir::Delete() {
if (path_.empty())
return false;
- file_util::g_bug108724_debug = true;
bool ret = file_util::Delete(path_, true);
- file_util::g_bug108724_debug = false;
if (ret) {
// We only clear the path if deleted the directory.
path_.clear();