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

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

 // 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/linux/mtp_device_delegate_impl_linux.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 324 matching lines @@
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(!file_path.empty());
 
   // If a ReadDirectory operation is in progress, the file info may already be
   // cached.
   FileInfoCache::const_iterator it = file_info_cache_.find(file_path);
   if (it != file_info_cache_.end()) {
     // TODO(thestig): This code is repeated in several places. Combine them.
     // e.g. c/b/media_galleries/win/mtp_device_operations_util.cc
-    const fileapi::DirectoryEntry& cached_file_entry = it->second;
+    const storage::DirectoryEntry& cached_file_entry = it->second;
     base::File::Info info;
     info.size = cached_file_entry.size;
     info.is_directory = cached_file_entry.is_directory;
     info.is_symbolic_link = false;
     info.last_modified = cached_file_entry.last_modified_time;
     info.creation_time = base::Time();
 
     success_callback.Run(info);
     return;
   }
@@ skipping 387 matching lines @@
     // Empty snapshot file.
     return OnDidWriteDataIntoSnapshotFile(
         snapshot_file_info, current_snapshot_request_info_->snapshot_file_path);
   }
   WriteDataIntoSnapshotFile(snapshot_file_info);
 }
 
 void MTPDeviceDelegateImplLinux::OnDidReadDirectory(
     uint32 dir_id,
     const ReadDirectorySuccessCallback& success_callback,
-    const fileapi::AsyncFileUtil::EntryList& file_list,
+    const storage::AsyncFileUtil::EntryList& file_list,
     bool has_more) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   FileIdToMTPFileNodeMap::iterator it = file_id_to_node_map_.find(dir_id);
   DCHECK(it != file_id_to_node_map_.end());
   MTPFileNode* dir_node = it->second;
 
   // Traverse the MTPFileNode tree to reconstuct the full path for |dir_id|.
   std::deque<std::string> dir_path_parts;
   MTPFileNode* parent_node = dir_node;
   while (parent_node->parent()) {
     dir_path_parts.push_front(parent_node->file_name());
     parent_node = parent_node->parent();
   }
   base::FilePath dir_path = device_path_;
   for (size_t i = 0; i < dir_path_parts.size(); ++i)
     dir_path = dir_path.Append(dir_path_parts[i]);
 
-  fileapi::AsyncFileUtil::EntryList normalized_file_list;
+  storage::AsyncFileUtil::EntryList normalized_file_list;
   for (size_t i = 0; i < file_list.size(); ++i) {
     normalized_file_list.push_back(file_list[i]);
-    fileapi::DirectoryEntry& entry = normalized_file_list.back();
+    storage::DirectoryEntry& entry = normalized_file_list.back();
 
     // |entry.name| has the file id encoded in it. Decode here.
     size_t separator_idx = entry.name.find_last_of(',');
     DCHECK_NE(std::string::npos, separator_idx);
     std::string file_id_str = entry.name.substr(separator_idx);
     file_id_str = file_id_str.substr(1);  // Get rid of the comma.
     uint32 file_id = 0;
     bool ret = base::StringToUint(file_id_str, &file_id);
     DCHECK(ret);
     entry.name = entry.name.substr(0, separator_idx);
@@ skipping 41 matching lines @@
 void MTPDeviceDelegateImplLinux::OnDidReadBytes(
     const ReadBytesSuccessCallback& success_callback,
     const base::File::Info& file_info, int bytes_read) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   success_callback.Run(file_info, bytes_read);
   PendingRequestDone();
 }
 
 void MTPDeviceDelegateImplLinux::OnDidFillFileCache(
     const base::FilePath& path,
-    const fileapi::AsyncFileUtil::EntryList& /* file_list */,
+    const storage::AsyncFileUtil::EntryList& /* file_list */,
     bool has_more) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(path.IsParent(pending_tasks_.front().path));
   if (has_more)
     return;  // Wait until all entries have been read.
   pending_tasks_.front().cached_path = path;
 }
 
 void MTPDeviceDelegateImplLinux::OnFillFileCacheFailed(
     base::File::Error /* error */) {
@@ skipping 90 matching lines @@
   *id = current_node->file_id();
   return true;
 }
 
 void CreateMTPDeviceAsyncDelegate(
     const std::string& device_location,
     const CreateMTPDeviceAsyncDelegateCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   callback.Run(new MTPDeviceDelegateImplLinux(device_location));
 }