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

trunk/src/webkit/plugins/npapi/plugin_list_mac.mm

Index: trunk/src/webkit/plugins/npapi/plugin_list_mac.mm
===================================================================
--- trunk/src/webkit/plugins/npapi/plugin_list_mac.mm	(revision 198849)
+++ trunk/src/webkit/plugins/npapi/plugin_list_mac.mm	(working copy)
@@ -7,7 +7,6 @@
 #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"
@@ -79,9 +78,9 @@
 
 void PluginList::GetPluginsInDir(
     const base::FilePath& path, std::vector<base::FilePath>* plugins) {
-  base::FileEnumerator enumerator(path,
-                                  false, // not recursive
-                                  base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator enumerator(path,
+                                       false, // not recursive
+                                       file_util::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     plugins->push_back(path);
Property changes on: trunk/src/webkit/plugins/npapi/plugin_list_mac.mm
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list_mac.mm:r3734-4217,4606-5108,5177-5263