Move FileEnumerator to its own file, do some refactoring.

chrome/test/webdriver/webdriver_util.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 "chrome/test/webdriver/webdriver_util.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 345 matching lines @@
                    std::string* error_msg) {
   std::string archive_error, entry_error;
   if (!UnzipArchive(unzip_dir, bytes, &archive_error) &&
       !UnzipEntry(unzip_dir, bytes, &entry_error)) {
     *error_msg = base::StringPrintf(
         "Failed to unzip file: Archive error: (%s) Entry error: (%s)",
         archive_error.c_str(), entry_error.c_str());
     return false;
   }
 
-  file_util::FileEnumerator enumerator(unzip_dir, false /* recursive */,
-      file_util::FileEnumerator::FILES |
-      file_util::FileEnumerator::DIRECTORIES);
+  base::FileEnumerator enumerator(unzip_dir, false /* recursive */,
+      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
   base::FilePath first_file = enumerator.Next();
   if (first_file.empty()) {
     *error_msg = "Zip contained 0 files";
     return false;
   }
   base::FilePath second_file = enumerator.Next();
   if (!second_file.empty()) {
     *error_msg = "Zip contained multiple files";
     return false;
   }
@@ skipping 160 matching lines @@
 
 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue(
     const Value* value, const webdriver::SkipParsing* t) {
   return true;
 }
 
 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert(
     const Value* value) {
   return true;
 }