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

trunk/src/tools/android/md5sum/md5sum.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.
 
 // Md5sum implementation for Android. This version handles files as well as
 // directories. Its output is sorted by file path.
 
 #include <fstream>
 #include <iostream>
 #include <set>
 #include <string>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/md5.h"
 
 namespace {
 
 const int kBufferSize = 1024;
 
 // Returns whether |path|'s MD5 was successfully written to |digest_string|.
 bool MD5Sum(const char* path, std::string* digest_string) {
@@ skipping 22 matching lines @@
 }
 
 // Returns the set of all files contained in |files|. This handles directories
 // by walking them recursively. Excludes, .svn directories and file under them.
 std::set<std::string> MakeFileSet(const char** files) {
   const std::string svn_dir_component = FILE_PATH_LITERAL("/.svn/");
   std::set<std::string> file_set;
   for (const char** file = files; *file; ++file) {
     base::FilePath file_path(*file);
     if (file_util::DirectoryExists(file_path)) {
-      base::FileEnumerator file_enumerator(
-          file_path, true /* recurse */, base::FileEnumerator::FILES);
+      file_util::FileEnumerator file_enumerator(
+          file_path, true /* recurse */, file_util::FileEnumerator::FILES);
       for (base::FilePath child, empty;
            (child = file_enumerator.Next()) != empty; ) {
         // If the path contains /.svn/, ignore it.
         if (child.value().find(svn_dir_component) == std::string::npos) {
           child = base::MakeAbsoluteFilePath(child);
           file_set.insert(child.value());
         }
       }
     } else {
       file_set.insert(*file);
@@ skipping 15 matching lines @@
   for (std::set<std::string>::const_iterator it = files.begin();
        it != files.end(); ++it) {
     if (!MD5Sum(it->c_str(), &digest))
       failed = true;
     base::FilePath file_path(*it);
     std::cout << digest << "  "
               << base::MakeAbsoluteFilePath(file_path).value() << std::endl;
   }
   return failed;
 }