Don't treat |is_directory| mismatch as an error in entry conversion in files.app.

chrome/browser/chromeos/file_manager/fileapi_util.cc

 // Copyright 2013 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/chromeos/file_manager/fileapi_util.h"
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 147 matching lines @@
     fileapi::FileSystemContext::ResolvedEntryType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != base::File::FILE_OK) {
     OnIteratorConverted(self_deleter.Pass(),
                         iterator,
                         CreateEntryDefinitionWithError(error));
     return;
   }
 
-  // Check the entry type.
-  if (iterator->is_directory &&
-      type == fileapi::FileSystemContext::RESOLVED_ENTRY_FILE) {
-    OnIteratorConverted(self_deleter.Pass(),
-                        iterator,
-                        CreateEntryDefinitionWithError(
-                            base::File::FILE_ERROR_NOT_A_DIRECTORY));
-    return;
-  }
-  if (!iterator->is_directory &&
-      type == fileapi::FileSystemContext::RESOLVED_ENTRY_DIRECTORY) {
-    OnIteratorConverted(self_deleter.Pass(),
-                        iterator,
-                        CreateEntryDefinitionWithError(
-                            base::File::FILE_ERROR_NOT_A_FILE));
-    return;
-  }
-
   EntryDefinition entry_definition;
   entry_definition.file_system_root_url = info.root_url.spec();
   entry_definition.file_system_name = info.name;
-  entry_definition.is_directory = iterator->is_directory;
+  switch (type) {
+    case fileapi::FileSystemContext::RESOLVED_ENTRY_FILE:
+      entry_definition.is_directory = false;
+      break;
+    case fileapi::FileSystemContext::RESOLVED_ENTRY_DIRECTORY:
+      entry_definition.is_directory = true;
+      break;
+    case fileapi::FileSystemContext::RESOLVED_ENTRY_NOT_FOUND:
+      entry_definition.is_directory = iterator->is_directory;
+      break;
+  }
   entry_definition.error = base::File::FILE_OK;
 
   // Construct a target Entry.fullPath value from the virtual path and the
   // root URL. Eg. Downloads/A/b.txt -> A/b.txt.
   const base::FilePath root_virtual_path =
       file_system_context_->CrackURL(info.root_url).virtual_path();
   DCHECK(root_virtual_path == iterator->virtual_path ||
          root_virtual_path.IsParent(iterator->virtual_path));
   base::FilePath full_path;
   root_virtual_path.AppendRelativePath(iterator->virtual_path, &full_path);
@@ skipping 131 matching lines @@
   file_definition_list.push_back(file_definition);
   ConvertFileDefinitionListToEntryDefinitionList(
       profile,
       extension_id,
       file_definition_list,
       base::Bind(&OnConvertFileDefinitionDone, callback));
 }
 
 }  // namespace util
 }  // namespace file_manager