Move file_util::Delete to the base namespace

webkit/browser/database/database_tracker.cc

 // Copyright (c) 2012 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 "webkit/browser/database/database_tracker.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 398 matching lines @@
                                      &new_origin_dir);
   base::FileEnumerator databases(
       origin_dir,
       false,
       base::FileEnumerator::FILES);
   for (base::FilePath database = databases.Next(); !database.empty();
        database = databases.Next()) {
     base::FilePath new_file = new_origin_dir.Append(database.BaseName());
     file_util::Move(database, new_file);
   }
-  file_util::Delete(origin_dir, true);
-  file_util::Delete(new_origin_dir, true); // might fail on windows.
+  base::Delete(origin_dir, true);
+  base::Delete(new_origin_dir, true); // might fail on windows.
 
   databases_table_->DeleteOriginIdentifier(origin_identifier);
 
   if (quota_manager_proxy_.get() && deleted_size) {
     quota_manager_proxy_->NotifyStorageModified(
         quota::QuotaClient::kDatabase,
         webkit_database::GetOriginFromIdentifier(origin_identifier),
         quota::kStorageTypeTemporary,
         -deleted_size);
   }
@@ skipping 21 matching lines @@
     // If there are left-over directories from failed deletion attempts, clean
     // them up.
     if (file_util::DirectoryExists(db_dir_)) {
       base::FileEnumerator directories(
           db_dir_,
           false,
           base::FileEnumerator::DIRECTORIES,
           kTemporaryDirectoryPattern);
       for (base::FilePath directory = directories.Next(); !directory.empty();
            directory = directories.Next()) {
-        file_util::Delete(directory, true);
+        base::Delete(directory, true);
       }
     }
 
     // If the tracker database exists, but it's corrupt or doesn't
     // have a meta table, delete the database directory.
     const base::FilePath kTrackerDatabaseFullPath =
         db_dir_.Append(base::FilePath(kTrackerDatabaseFileName));
     if (file_util::DirectoryExists(db_dir_) &&
         file_util::PathExists(kTrackerDatabaseFullPath) &&
         (!db_->Open(kTrackerDatabaseFullPath) ||
          !sql::MetaTable::DoesTableExist(db_.get()))) {
       db_->Close();
-      if (!file_util::Delete(db_dir_, true))
+      if (!base::Delete(db_dir_, true))
         return false;
     }
 
     db_->set_histogram_tag("DatabaseTracker");
 
     databases_table_.reset(new DatabasesTable(db_.get()));
     meta_table_.reset(new sql::MetaTable());
 
     is_initialized_ =
         file_util::CreateDirectory(db_dir_) &&
@@ skipping 305 matching lines @@
   shutting_down_ = true;
   is_initialized_ = false;
 
   for (FileHandlesMap::iterator it = incognito_file_handles_.begin();
        it != incognito_file_handles_.end(); it++)
     base::ClosePlatformFile(it->second);
 
   base::FilePath incognito_db_dir =
       profile_path_.Append(kIncognitoDatabaseDirectoryName);
   if (file_util::DirectoryExists(incognito_db_dir))
-    file_util::Delete(incognito_db_dir, true);
+    base::Delete(incognito_db_dir, true);
 }
 
 void DatabaseTracker::ClearSessionOnlyOrigins() {
   shutting_down_ = true;
 
   bool has_session_only_databases =
       special_storage_policy_.get() &&
       special_storage_policy_->HasSessionOnlyOrigins();
 
   // Clearing only session-only databases, and there are none.
@@ skipping 53 matching lines @@
   if (!db_tracker_thread_->BelongsToCurrentThread()) {
     db_tracker_thread_->PostTask(
         FROM_HERE,
         base::Bind(&DatabaseTracker::SetForceKeepSessionState, this));
     return;
   }
   force_keep_session_state_ = true;
 }
 
 }  // namespace webkit_database