Make ScopedTempDir::Delete return a bool so that its functionality can be te...

base/scoped_temp_dir.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/scoped_temp_dir.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 
 ScopedTempDir::ScopedTempDir() {
@@ skipping 39 matching lines @@
     return false;
 
   if (!file_util::DirectoryExists(path) &&
       !file_util::CreateDirectory(path))
     return false;
 
   path_ = path;
   return true;
 }
 
-void ScopedTempDir::Delete() {
-  if (!path_.empty() && !file_util::Delete(path_, true))
-    LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
-  path_.clear();
+bool ScopedTempDir::Delete() {
+  bool ret = false;
+  if (!path_.empty()) {

[Paweł Hajdan Jr., 2010/11/26 21:01:20]

nit: Rather:

if (path.empty())
  return false;

[tommi (sloooow) - chröme, 2010/11/26 21:04:44]

Done.

+    ret = file_util::Delete(path_, true);
+    if (!ret) {

[Paweł Hajdan Jr., 2010/11/26 21:01:20]

nit: Put success case first to avoid double-negation for "else".

[tommi (sloooow) - chröme, 2010/11/26 21:04:44]

Done.

+      // Note that we don't clear the path if we can't delete the directory.
+      LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
+    } else {
+      path_.clear();
+    }
+  }
+  return ret;
 }
 
 FilePath ScopedTempDir::Take() {
   FilePath ret = path_;
   path_ = FilePath();
   return ret;
 }
 
 bool ScopedTempDir::IsValid() const {
   return !path_.empty() && file_util::DirectoryExists(path_);
 }