Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

 // 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/media_galleries/mac/mtp_device_delegate_impl_mac.h"
 
 #include <algorithm>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/storage_monitor/image_capture_device.h"
 #include "components/storage_monitor/image_capture_device_manager.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util.h"
 
 namespace {
 
 int kReadDirectoryTimeLimitSeconds = 20;
 
 typedef MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback
     CreateSnapshotFileSuccessCallback;
 typedef MTPDeviceAsyncDelegate::ErrorCallback ErrorCallback;
 typedef MTPDeviceAsyncDelegate::GetFileInfoSuccessCallback
     GetFileInfoSuccessCallback;
@@ skipping 338 matching lines @@
 }
 
 void MTPDeviceDelegateImplMac::NotifyReadDir() {
   for (ReadDirTransactionList::iterator iter = read_dir_transactions_.begin();
        iter != read_dir_transactions_.end(); ++iter) {
     base::FilePath read_path = iter->directory;
     // This code assumes that the list of paths is sorted, so we skip to
     // where we find the entry for the directory, then read out all first-level
     // children. We then break when the DirName is greater than the read_path,
     // as that means we've passed the subdir we're reading.
-    fileapi::AsyncFileUtil::EntryList entry_list;
+    storage::AsyncFileUtil::EntryList entry_list;
     bool found_path = false;
     for (size_t i = 0; i < file_paths_.size(); ++i) {
       if (file_paths_[i] == read_path) {
         found_path = true;
         continue;
       }
       if (!read_path.IsParent(file_paths_[i])) {
         if (read_path < file_paths_[i].DirName())
           break;
         continue;
       }
       if (file_paths_[i].DirName() != read_path)
         continue;
 
       base::FilePath relative_path;
       read_path.AppendRelativePath(file_paths_[i], &relative_path);
       base::File::Info info = file_info_[file_paths_[i].value()];
-      fileapi::DirectoryEntry entry;
+      storage::DirectoryEntry entry;
       entry.name = relative_path.value();
       entry.is_directory = info.is_directory;
       entry.size = info.size;
       entry.last_modified_time = info.last_modified;
       entry_list.push_back(entry);
     }
 
     if (found_path) {
       content::BrowserThread::PostTask(content::BrowserThread::IO,
           FROM_HERE,
@@ skipping 80 matching lines @@
   std::string device_name = base::FilePath(device_location).BaseName().value();
   std::string device_id;
   storage_monitor::StorageInfo::Type type;
   bool cracked = storage_monitor::StorageInfo::CrackDeviceId(
       device_name, &type, &device_id);
   DCHECK(cracked);
   DCHECK_EQ(storage_monitor::StorageInfo::MAC_IMAGE_CAPTURE, type);
 
   cb.Run(new MTPDeviceDelegateImplMac(device_id, device_location));
 }