Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 43 matching lines @@
     const tracked_objects::Location location;
     const base::Closure task;
   };
 
   class MTPFileNode;
 
   // Maps file ids to file nodes.
   typedef std::map<uint32, MTPFileNode*> FileIdToMTPFileNodeMap;
 
   // Maps file paths to file info.
-  typedef std::map<base::FilePath, fileapi::DirectoryEntry> FileInfoCache;
+  typedef std::map<base::FilePath, storage::DirectoryEntry> FileInfoCache;
 
   // Should only be called by CreateMTPDeviceAsyncDelegate() factory call.
   // Defer the device initializations until the first file operation request.
   // Do all the initializations in EnsureInitAndRunTask() function.
   explicit MTPDeviceDelegateImplLinux(const std::string& device_location);
 
   // Destructed via CancelPendingTasksAndDeleteDelegate().
   virtual ~MTPDeviceDelegateImplLinux();
 
   // MTPDeviceAsyncDelegate:
@@ skipping 104 matching lines @@
 
   // Called when ReadDirectory() succeeds.
   //
   // |dir_id| is the directory read.
   // |success_callback| is invoked to notify the caller about the directory
   // file entries.
   // |file_list| contains the directory file entries with their file ids.
   // |has_more| is true if there are more file entries to read.
   void OnDidReadDirectory(uint32 dir_id,
                           const ReadDirectorySuccessCallback& success_callback,
-                          const fileapi::AsyncFileUtil::EntryList& file_list,
+                          const storage::AsyncFileUtil::EntryList& file_list,
                           bool has_more);
 
   // Called when WriteDataIntoSnapshotFile() succeeds.
   //
   // |snapshot_file_info| specifies the snapshot file metadata details.
   //
   // |current_snapshot_request_info_.success_callback| is invoked to notify the
   // caller about |snapshot_file_info|.
   void OnDidWriteDataIntoSnapshotFile(
       const base::File::Info& snapshot_file_info,
       const base::FilePath& snapshot_file_path);
 
   // Called when WriteDataIntoSnapshotFile() fails.
   //
   // |error| specifies the file error code.
   //
   // |current_snapshot_request_info_.error_callback| is invoked to notify the
   // caller about |error|.
   void OnWriteDataIntoSnapshotFileError(base::File::Error error);
 
   // Called when ReadBytes() succeeds.
   //
   // |success_callback| is invoked to notify the caller about the read bytes.
   // |bytes_read| is the number of bytes read.
   void OnDidReadBytes(const ReadBytesSuccessCallback& success_callback,
                       const base::File::Info& file_info, int bytes_read);
 
   // Called when FillFileCache() succeeds.
   void OnDidFillFileCache(const base::FilePath& path,
-                          const fileapi::AsyncFileUtil::EntryList& file_list,
+                          const storage::AsyncFileUtil::EntryList& file_list,
                           bool has_more);
 
   // Called when FillFileCache() fails.
   void OnFillFileCacheFailed(base::File::Error error);
 
   // Handles the device file |error| while operating on |file_id|.
   // |error_callback| is invoked to notify the caller about the file error.
   void HandleDeviceFileError(const ErrorCallback& error_callback,
                              uint32 file_id,
                              base::File::Error error);
@@ skipping 56 matching lines @@
   // the ReadDirectory operation.
   FileInfoCache file_info_cache_;
 
   // For callbacks that may run after destruction.
   base::WeakPtrFactory<MTPDeviceDelegateImplLinux> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MTPDeviceDelegateImplLinux);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_DELEGATE_IMPL_LINUX_H_