Move FileEnumerator to its own file, do some refactoring.

chrome/test/chromedriver/util.cc

 // Copyright (c) 2013 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/chromedriver/util.h"
 
 #include "base/base64.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/rand_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/ui_events.h"
@@ skipping 357 matching lines @@
   Status status = UnzipArchive(unzip_dir, bytes);
   if (status.IsError()) {
     Status entry_status = UnzipEntry(unzip_dir, bytes);
     if (entry_status.IsError()) {
       return Status(kUnknownError, base::StringPrintf(
           "archive error: (%s), entry error: (%s)",
           status.message().c_str(), entry_status.message().c_str()));
     }
   }
 
-  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())
     return Status(kUnknownError, "contained 0 files");
 
   base::FilePath second_file = enumerator.Next();
   if (!second_file.empty())
     return Status(kUnknownError, "contained multiple files");
 
   *file = first_file;
   return Status(kOk);
 }