Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/chrome/installer/util/delete_after_reboot_helper.cc

 // Copyright (c) 2010 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.
 //
 // This file defines helper methods used to schedule files for deletion
 // on next reboot. The code here is heavily borrowed and simplified from
 //  http://code.google.com/p/omaha/source/browse/trunk/common/file.cc and
 //  http://code.google.com/p/omaha/source/browse/trunk/common/utils.cc
 //
 // This implementation really is not fast, so do not use it where that will
 // matter.
 
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/win/registry.h"
 #include "base/string_util.h"
 
 // The moves-pending-reboot is a MULTISZ registry key in the HKLM part of the
 // registry.
 const wchar_t kSessionManagerKey[] =
     L"SYSTEM\\CurrentControlSet\\Control\\Session Manager";
 const wchar_t kPendingFileRenameOps[] = L"PendingFileRenameOperations";
 
 namespace {
@@ skipping 80 matching lines @@
   }
   // Confirm it is a directory
   if (!(dir_attributes & FILE_ATTRIBUTE_DIRECTORY)) {
     LOG(ERROR) << "Scheduled directory is not a directory: " << dir_name;
     return false;
   }
 
   // First schedule all the normal files for deletion.
   {
     bool success = true;
-    base::FileEnumerator file_enum(base::FilePath(dir_name), false,
-                                   base::FileEnumerator::FILES);
+    file_util::FileEnumerator file_enum(base::FilePath(dir_name), false,
+                                        file_util::FileEnumerator::FILES);
     for (base::FilePath file = file_enum.Next(); !file.empty();
          file = file_enum.Next()) {
       success = ScheduleFileSystemEntityForDeletion(file.value().c_str());
       if (!success) {
         LOG(ERROR) << "Failed to schedule file for deletion: " << file.value();
         return false;
       }
     }
   }
 
   // Then recurse to all the subdirectories.
   {
     bool success = true;
-    base::FileEnumerator dir_enum(base::FilePath(dir_name), false,
-                                  base::FileEnumerator::DIRECTORIES);
+    file_util::FileEnumerator dir_enum(base::FilePath(dir_name), false,
+                                       file_util::FileEnumerator::DIRECTORIES);
     for (base::FilePath sub_dir = dir_enum.Next(); !sub_dir.empty();
          sub_dir = dir_enum.Next()) {
       success = ScheduleDirectoryForDeletion(sub_dir.value().c_str());
       if (!success) {
         LOG(ERROR) << "Failed to schedule subdirectory for deletion: "
                    << sub_dir.value();
         return false;
       }
     }
   }
@@ skipping 237 matching lines @@
         ERROR_SUCCESS);
   }
   std::vector<char> buffer;
   StringArrayToMultiSZBytes(strings_to_keep, &buffer);
   DCHECK_GT(buffer.size(), 0U);
   if (buffer.empty())
     return false;
   return (session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
       buffer.size(), REG_MULTI_SZ) == ERROR_SUCCESS);
 }