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

chrome/browser/media_galleries/linux/mtp_device_task_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_TASK_HELPER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_TASK_HELPER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"
 #include "device/media_transfer_protocol/mtp_file_entry.pb.h"
-#include "webkit/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util.h"
 
 class MTPReadFileWorker;
 struct SnapshotRequestInfo;
 
 // MTPDeviceTaskHelper dispatches the media transfer protocol (MTP) device
 // operation requests (such as GetFileInfo, ReadDirectory, CreateSnapshotFile,
 // OpenStorage and CloseStorage) to the MediaTransferProtocolManager.
 // MTPDeviceTaskHelper lives on the UI thread. MTPDeviceTaskHelperMapService
 // owns the MTPDeviceTaskHelper objects. MTPDeviceTaskHelper is instantiated per
 // MTP device storage.
 class MTPDeviceTaskHelper {
  public:
   typedef base::Callback<void(bool succeeded)> OpenStorageCallback;
 
   typedef MTPDeviceAsyncDelegate::GetFileInfoSuccessCallback
       GetFileInfoSuccessCallback;
 
   // NOTE: The file names in the entry list have their file id appended at the
   // end. e.g. foo.jpg with file id 45 becomes foo.jpg,45.
-  typedef base::Callback<void(const fileapi::AsyncFileUtil::EntryList& entries,
+  typedef base::Callback<void(const storage::AsyncFileUtil::EntryList& entries,
                               bool has_more)> ReadDirectorySuccessCallback;
 
   typedef MTPDeviceAsyncDelegate::ErrorCallback ErrorCallback;
 
   MTPDeviceTaskHelper();
   ~MTPDeviceTaskHelper();
 
   // Dispatches the request to the MediaTransferProtocolManager to open the MTP
   // storage for communication.
   //
@@ skipping 125 matching lines @@
   // Used to handle WriteDataInfoSnapshotFile request.
   scoped_ptr<MTPReadFileWorker> read_file_worker_;
 
   // For callbacks that may run after destruction.
   base::WeakPtrFactory<MTPDeviceTaskHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MTPDeviceTaskHelper);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_TASK_HELPER_H_