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

trunk/src/webkit/plugins/npapi/plugin_list_posix.cc

 // Copyright (c) 2011 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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/cpu.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
 
 namespace webkit {
 namespace npapi {
 
@@ skipping 177 matching lines @@
 }
 
 void PluginList::GetPluginsInDir(
     const base::FilePath& dir_path, std::vector<base::FilePath>* plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
 
   // Construct and stat a list of all filenames under consideration, for
   // later sorting by mtime.
   FileTimeList files;
-  base::FileEnumerator enumerator(dir_path,
-                                  false,  // not recursive
-                                  base::FileEnumerator::FILES);
+  file_util::FileEnumerator enumerator(dir_path,
+                                       false,  // not recursive
+                                       file_util::FileEnumerator::FILES);
   for (base::FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     // Skip over Mozilla .xpt files.
     if (path.MatchesExtension(FILE_PATH_LITERAL(".xpt")))
       continue;
 
     // Java doesn't like being loaded through a symlink, since it uses
     // its path to find dependent data files.
     // MakeAbsoluteFilePath calls through to realpath(), which resolves
     // symlinks.
@@ skipping 72 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit