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

trunk/src/chrome/browser/file_select_helper.cc

 // 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 "chrome/browser/file_select_helper.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 191 matching lines @@
 }
 
 void FileSelectHelper::OnListFile(
     int id,
     const net::DirectoryLister::DirectoryListerData& data) {
   ActiveDirectoryEnumeration* entry = directory_enumerations_[id];
 
   // Directory upload returns directories via a "." file, so that
   // empty directories are included.  This util call just checks
   // the flags in the structure; there's no file I/O going on.
-  if (data.info.IsDirectory())
+  if (file_util::FileEnumerator::IsDirectory(data.info))
     entry->results_.push_back(data.path.Append(FILE_PATH_LITERAL(".")));
   else
     entry->results_.push_back(data.path);
 }
 
 void FileSelectHelper::OnListDone(int id, int error) {
   // This entry needs to be cleaned up when this function is done.
   scoped_ptr<ActiveDirectoryEnumeration> entry(directory_enumerations_[id]);
   directory_enumerations_.erase(id);
   if (!entry->rvh_)
@@ skipping 261 matching lines @@
   // A 1 character accept type will always be invalid (either a "." in the case
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
       StringToLowerASCII(accept_type) != accept_type ||
       TrimWhitespaceASCII(accept_type, TRIM_ALL, &unused) != TRIM_NONE) {
     return false;
   }
   return true;
 }