Do not call stat() when reading directories via File API.

chrome/browser/media_galleries/linux/mtp_device_task_helper.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/media_galleries/linux/mtp_device_task_helper.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"

[Lei Zhang, 2015/11/12 07:25:16]

These 2 conversion headers can be deleted too.

[mtomasz, 2015/11/12 07:48:24]

Done.

 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/media_galleries/linux/mtp_device_object_enumerator.h"
 #include "chrome/browser/media_galleries/linux/mtp_read_file_worker.h"
 #include "chrome/browser/media_galleries/linux/snapshot_file_details.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "net/base/io_buffer.h"
 #include "storage/browser/fileapi/async_file_util.h"
 #include "storage/common/fileapi/file_system_util.h"
@@ skipping 140 matching lines @@
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   GetMediaTransferProtocolManager()->RenameObject(
       device_handle_, object_id, new_name,
       base::Bind(&MTPDeviceTaskHelper::OnRenameObject,
                  weak_ptr_factory_.GetWeakPtr(), success_callback,
                  error_callback));
 }
 
+MTPDeviceTaskHelper::MTPEntry::MTPEntry() : file_id(0) {}
+
 // TODO(yawano) storage_name is not used, delete it.
 void MTPDeviceTaskHelper::CopyFileFromLocal(
     const std::string& storage_name,
     const int source_file_descriptor,
     const uint32 parent_id,
     const std::string& file_name,
     const CopyFileFromLocalSuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 72 matching lines @@
 void MTPDeviceTaskHelper::OnDidReadDirectory(
     const ReadDirectorySuccessCallback& success_callback,
     const ErrorCallback& error_callback,
     const std::vector<MtpFileEntry>& file_entries,
     bool has_more,
     bool error) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (error)
     return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);
 
-  storage::AsyncFileUtil::EntryList entries;
+  MTPEntries entries;
   base::FilePath current;
   MTPDeviceObjectEnumerator file_enum(file_entries);
   while (!(current = file_enum.Next()).empty()) {
-    storage::DirectoryEntry entry;
+    MTPEntry entry;
     entry.name = storage::VirtualPath::BaseName(current).value();
     uint32 file_id = 0;

[Lei Zhang, 2015/11/12 07:25:17]

Get rid of the temporary and pass |entry.file_id| to GetEntryId() ?

[mtomasz, 2015/11/12 07:48:24]

Done.

     bool ret = file_enum.GetEntryId(&file_id);
     DCHECK(ret);
-    entry.name.push_back(',');
-    entry.name += base::UintToString(file_id);
-    entry.is_directory = file_enum.IsDirectory();
-    entry.size = file_enum.Size();
-    entry.last_modified_time = file_enum.LastModifiedTime();
+    entry.file_id = file_id;
+    entry.file_info.is_directory = file_enum.IsDirectory();
+    entry.file_info.size = file_enum.Size();
+    entry.file_info.last_modified = file_enum.LastModifiedTime();
     entries.push_back(entry);
   }
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(success_callback, entries, has_more));
 }
 
 void MTPDeviceTaskHelper::OnGetFileInfoToReadBytes(
     const MTPDeviceAsyncDelegate::ReadBytesRequest& request,
@@ skipping 106 matching lines @@
 }
 
 void MTPDeviceTaskHelper::HandleDeviceError(
     const ErrorCallback& error_callback,
     base::File::Error error) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::BrowserThread::PostTask(content::BrowserThread::IO,
                                    FROM_HERE,
                                    base::Bind(error_callback, error));
 }