Move FileEnumerator to its own file, do some refactoring.

webkit/plugins/npapi/plugin_list_mac.mm

 // 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 "webkit/plugins/npapi/plugin_list.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/mac/mac_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 
 namespace webkit {
 namespace npapi {
 
@@ skipping 51 matching lines @@
 void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
   // Load from the user's area
   GetPluginCommonDirectory(plugin_dirs, true);
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
 }
 
 void PluginList::GetPluginsInDir(
     const base::FilePath& path, std::vector<base::FilePath>* plugins) {
-  file_util::FileEnumerator enumerator(path,
-                                       false, // not recursive
-                                       file_util::FileEnumerator::DIRECTORIES);
+  base::FileEnumerator enumerator(path,
+                                  false, // not recursive
+                                  base::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     plugins->push_back(path);
   }
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
     const WebPluginInfo& info,
     std::vector<webkit::WebPluginInfo>* plugins) {
   return !IsBlacklistedPlugin(info);
 }
 
 }  // namespace npapi
 }  // namespace webkit