mojo leveldb: Address some comments that came after it was put in the CQ.

components/filesystem/directory_impl.cc

 // Copyright 2015 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 "components/filesystem/directory_impl.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
@@ skipping 50 matching lines @@
                              mojo::InterfaceRequest<File> file,
                              uint32_t open_flags,
                              const OpenFileCallback& callback) {
   base::FilePath path;
   FileError error = ValidatePath(raw_path, directory_path_, &path);
   if (error != FileError::OK) {
     callback.Run(error);
     return;
   }
 
-#if defined(OS_WIN)
-  // On Windows, FILE_FLAG_BACKUP_SEMANTICS is needed to open a directory.
-  if (base::DirectoryExists(path))
-    open_flags |= base::File::FLAG_BACKUP_SEMANTICS;
-#endif  // OS_WIN
-
-  base::File base_file(path, open_flags);
-  if (!base_file.IsValid()) {
-    callback.Run(GetError(base_file));
-    return;
-  }
-
-  base::File::Info info;
-  if (!base_file.GetInfo(&info)) {
-    callback.Run(FileError::FAILED);
-    return;
-  }
-
-  if (info.is_directory) {
+  if (base::DirectoryExists(path)) {
     // We must not return directories as files. In the file abstraction, we can
     // fetch raw file descriptors over mojo pipes, and passing a file
     // descriptor to a directory is a sandbox escape on Windows.
     callback.Run(FileError::NOT_A_FILE);
     return;
   }
 
+  base::File base_file(path, open_flags);
+  if (!base_file.IsValid()) {
+    callback.Run(GetError(base_file));
+    return;
+  }
+
   if (file.is_pending()) {
     new FileImpl(std::move(file), path, std::move(base_file), lock_table_);
   }
   callback.Run(FileError::OK);
 }
 
 void DirectoryImpl::OpenFileHandle(const mojo::String& raw_path,
                                    uint32_t open_flags,
                                    const OpenFileHandleCallback& callback) {
   base::FilePath path;
   FileError error = ValidatePath(raw_path, directory_path_, &path);
   if (error != FileError::OK) {
     callback.Run(error, ScopedHandle());
     return;
   }
 
-#if defined(OS_WIN)
-  // On Windows, FILE_FLAG_BACKUP_SEMANTICS is needed to open a directory.
-  if (base::DirectoryExists(path))
-    open_flags |= base::File::FLAG_BACKUP_SEMANTICS;
-#endif  // OS_WIN
-
-  base::File base_file(path, open_flags);
-  if (!base_file.IsValid()) {
-    callback.Run(GetError(base_file), ScopedHandle());
-    return;
-  }
-
-  base::File::Info info;
-  if (!base_file.GetInfo(&info)) {
-    callback.Run(FileError::FAILED, ScopedHandle());
-    return;
-  }
-
-  if (info.is_directory) {
+  if (base::DirectoryExists(path)) {
     // We must not return directories as files. In the file abstraction, we can
     // fetch raw file descriptors over mojo pipes, and passing a file
     // descriptor to a directory is a sandbox escape on Windows.
     callback.Run(FileError::NOT_A_FILE, ScopedHandle());
     return;
   }
 
+  base::File base_file(path, open_flags);
+  if (!base_file.IsValid()) {
+    callback.Run(GetError(base_file), ScopedHandle());
+    return;
+  }
+
   MojoHandle mojo_handle;
   MojoResult create_result = MojoCreatePlatformHandleWrapper(
       base_file.TakePlatformFile(), &mojo_handle);
   if (create_result != MOJO_RESULT_OK) {
     callback.Run(FileError::FAILED, ScopedHandle());
     return;
   }
 
   callback.Run(FileError::OK, ScopedHandle(mojo::Handle(mojo_handle)));
 }
@@ skipping 202 matching lines @@
                         data_size) == -1) {
       callback.Run(GetError(base_file));
       return;
     }
   }
 
   callback.Run(FileError::OK);
 }
 
 }  // namespace filesystem