Fix FileEnumerator (win) for non-recursive, directory-only enumerations....

base/file_util_win.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
@@ skipping 659 matching lines @@
 
   // Construct the absolute filename.
   cur_file.insert(0, root_path_);
 
   if (find_data_.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
     if (recursive_) {
       // If |cur_file| is a directory, and we are doing recursive searching, add
       // it to pending_paths_ so we scan it after we finish scanning this
       // directory.
       pending_paths_.push(cur_file);
-      return (file_type_ & FileEnumerator::DIRECTORIES) ? cur_file : Next();
     }
-
-    if ((file_type_ & FileEnumerator::DIRECTORIES) == 0)
-      return Next();
+    return (file_type_ & FileEnumerator::DIRECTORIES) ? cur_file : Next();
   }
   return (file_type_ & FileEnumerator::FILES) ? cur_file : Next();
 }
 
 }  // namespace file_util