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

Broke both windows clobber and official builders' compile with this error:

771>Link:
771>     Creating library ..\..\..\build\Release\lib\gcp_portmon64.lib and
object ..\..\..\build\Release\lib\gcp_portmon64.exp
771>base.lib(path_service.obj) : fatalerror LNK1112: module machine type 'X86'
conflicts with target machine type 'x64'
771>
771>Build FAILED.

> Move FileEnumerator to its own file, do some refactoring.
> 
> It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
> 
> BUG=175002
> R=rvargas@chromium.org
> 
> Review URL: https://codereview.chromium.org/13165005

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/14824006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198850 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index 6c9047e..cf53ce0 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -19,7 +19,6 @@
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/stringprintf.h"
 
 namespace media {
@@ -101,14 +100,15 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
   device_names->clear();
 
   base::FilePath path("/dev/");
-  base::FileEnumerator enumerator(
-      path, false, base::FileEnumerator::FILES, "video*");
+  file_util::FileEnumerator enumerator(
+      path, false, file_util::FileEnumerator::FILES, "video*");
 
   while (!enumerator.Next().empty()) {
-    base::FileEnumerator::FileInfo info = enumerator.GetInfo();
+    file_util::FileEnumerator::FindInfo info;
+    enumerator.GetFindInfo(&info);
 
     Name name;
-    name.unique_id = path.value() + info.GetName().value();
+    name.unique_id = path.value() + info.filename;
     if ((fd = open(name.unique_id.c_str() , O_RDONLY)) < 0) {
       // Failed to open this device.
       continue;
@@ -123,7 +123,7 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
         name.device_name = base::StringPrintf("%s", cap.card);
         device_names->push_back(name);
       } else {
-        DVLOG(1) << "No usable formats reported by " << info.GetName().value();
+        DVLOG(1) << "No usable formats reported by " << info.filename;
       }
     }
     close(fd);