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

trunk/src/chrome/browser/extensions/sandboxed_unpacker_unittest.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 "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/unpacker.h"
@@ skipping 109 matching lines @@
         *unpacker_->parsed_manifest());
   }
 
   base::FilePath GetInstallPath() {
     return temp_dir_.path().AppendASCII(
         extension_filenames::kTempExtensionName);
   }
 
   bool TempFilesRemoved() {
     // Check that temporary files were cleaned up.
-    int files_and_dirs = base::FileEnumerator::DIRECTORIES |
-        base::FileEnumerator::FILES;
+    int files_and_dirs = file_util::FileEnumerator::DIRECTORIES |
+        file_util::FileEnumerator::FILES;
 
-    base::FileEnumerator temp_iterator(
+    file_util::FileEnumerator temp_iterator(
       temp_path_,
       true,  // recursive
       files_and_dirs
     );
     int items_not_removed = 0;
     base::FilePath item_in_temp;
     item_in_temp = temp_iterator.Next();
     while (!item_in_temp.value().empty()) {
       items_not_removed++;
       EXPECT_STREQ(FILE_PATH_LITERAL(""), item_in_temp.value().c_str())
@@ skipping 63 matching lines @@
   // Check that there is newer _locales/en_US/messages.json file.
   base::PlatformFileInfo new_info;
   EXPECT_TRUE(file_util::GetFileInfo(messages_file, &new_info));
 
   EXPECT_TRUE(new_info.last_modified > old_info.last_modified);
 
   ASSERT_TRUE(TempFilesRemoved());
 }
 
 }  // namespace extensions