summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-05 04:51:19 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-05 04:51:19 +0000
commit9940aca46115e2a2a14fc1e8a58ae181e19b4b99 (patch)
tree2d0fed4cba02cf9cfb35d3ea8a329506e9084374
parent8ab08cba846cbe52fdb365dca172ae403a18e0b0 (diff)
downloadchromium_src-9940aca46115e2a2a14fc1e8a58ae181e19b4b99.zip
chromium_src-9940aca46115e2a2a14fc1e8a58ae181e19b4b99.tar.gz
chromium_src-9940aca46115e2a2a14fc1e8a58ae181e19b4b99.tar.bz2
Revert 120503 - Tighten debug logging slightly.
BUG=108724 TBR=yoz@chromium.org Review URL: https://chromiumcodereview.appspot.com/9310109 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/9309105 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120505 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/scoped_temp_dir.cc2
-rw-r--r--chrome/common/extensions/extension_unpacker_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/scoped_temp_dir.cc b/base/scoped_temp_dir.cc
index 2349d60..6af4d75 100644
--- a/base/scoped_temp_dir.cc
+++ b/base/scoped_temp_dir.cc
@@ -63,7 +63,9 @@ 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();
diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc
index 10a7b6d..d8978dc 100644
--- a/chrome/common/extensions/extension_unpacker_unittest.cc
+++ b/chrome/common/extensions/extension_unpacker_unittest.cc
@@ -22,9 +22,7 @@ public:
~ExtensionUnpackerTest() {
LOG(WARNING) << "Deleting temp dir: "
<< temp_dir_.path().LossyDisplayName();
- file_util::g_bug108724_debug = true;
LOG(WARNING) << temp_dir_.Delete();
- file_util::g_bug108724_debug = false;
}
void SetupUnpacker(const std::string& crx_name) {