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

chrome/browser/local_discovery/storage/privet_filesystem_operations.cc

 // Copyright 2014 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/local_discovery/storage/privet_filesystem_operations.h"
 
 #include "chrome/browser/local_discovery/storage/privet_filesystem_constants.h"
 
 namespace local_discovery {
 
 PrivetFileSystemOperationFactory::PrivetFileSystemOperationFactory(
     content::BrowserContext* browser_context)
     : browser_context_(browser_context), weak_factory_(this) {}
 
 PrivetFileSystemOperationFactory::~PrivetFileSystemOperationFactory() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   RemoveAllOperations();
 }
 
 void PrivetFileSystemOperationFactory::GetFileInfo(
-    const fileapi::FileSystemURL& url,
-    const fileapi::AsyncFileUtil::GetFileInfoCallback& callback) {
+    const storage::FileSystemURL& url,
+    const storage::AsyncFileUtil::GetFileInfoCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   PrivetFileSystemAsyncOperation* operation =
       new PrivetFileSystemDetailsOperation(
           url.path(), browser_context_, this, &attribute_cache_, callback);
   async_operations_.insert(operation);
   operation->Start();
 }
 
 void PrivetFileSystemOperationFactory::ReadDirectory(
-    const fileapi::FileSystemURL& url,
-    const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) {
+    const storage::FileSystemURL& url,
+    const storage::AsyncFileUtil::ReadDirectoryCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   PrivetFileSystemAsyncOperation* operation = new PrivetFileSystemListOperation(
       url.path(), browser_context_, this, &attribute_cache_, callback);
   async_operations_.insert(operation);
   operation->Start();
 }
 
 void PrivetFileSystemOperationFactory::RemoveOperation(
     PrivetFileSystemAsyncOperation* operation) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ skipping 58 matching lines @@
   privet_client_ = PrivetV1HTTPClient::CreateDefault(privet_http_client.Pass());
   delegate_->PrivetFileSystemResolved(privet_client_.get(),
                                       parsed_path_.path);
 }
 
 PrivetFileSystemListOperation::PrivetFileSystemListOperation(
     const base::FilePath& full_path,
     content::BrowserContext* browser_context,
     PrivetFileSystemAsyncOperationContainer* container,
     PrivetFileSystemAttributeCache* attribute_cache,
-    const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback)
+    const storage::AsyncFileUtil::ReadDirectoryCallback& callback)
     : core_(full_path, browser_context, this),
       full_path_(full_path),
       container_(container),
       attribute_cache_(attribute_cache),
       callback_(callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 PrivetFileSystemListOperation::~PrivetFileSystemListOperation() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ skipping 25 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   list_operation_.reset();
 
   if (!value) {
     SignalError();
     return;
   }
 
   attribute_cache_->AddFileInfoFromJSON(full_path_, value);
 
-  fileapi::AsyncFileUtil::EntryList entry_list;
+  storage::AsyncFileUtil::EntryList entry_list;
 
   const base::ListValue* entries;
   if (!value->GetList(kPrivetListEntries, &entries)) {
     SignalError();
     return;
   }
 
   for (size_t i = 0; i < entries->GetSize(); i++) {
     const base::DictionaryValue* entry_value;
     if (!entries->GetDictionary(i, &entry_value)) {
       SignalError();
       return;
     }
 
     std::string name;
     std::string type;
     int size = 0;
 
     entry_value->GetString(kPrivetListKeyName, &name);
     entry_value->GetString(kPrivetListKeyType, &type);
     entry_value->GetInteger(kPrivetListKeySize, &size);
 
-    fileapi::DirectoryEntry entry(
-        name,
-        (type == kPrivetListTypeDir) ?
-        fileapi::DirectoryEntry::DIRECTORY : fileapi::DirectoryEntry::FILE,
-        size,
-        base::Time() /* TODO(noamsml) */);
+    storage::DirectoryEntry entry(name,
+                                  (type == kPrivetListTypeDir)
+                                      ? storage::DirectoryEntry::DIRECTORY
+                                      : storage::DirectoryEntry::FILE,
+                                  size,
+                                  base::Time() /* TODO(noamsml) */);
 
     entry_list.push_back(entry);
   }
 
   TriggerCallbackAndDestroy(base::File::FILE_OK, entry_list, false);
 }
 
 void PrivetFileSystemListOperation::SignalError() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   TriggerCallbackAndDestroy(base::File::FILE_ERROR_FAILED,
-                            fileapi::AsyncFileUtil::EntryList(),
+                            storage::AsyncFileUtil::EntryList(),
                             false);
 }
 
 void PrivetFileSystemListOperation::TriggerCallbackAndDestroy(
     base::File::Error result,
-    const fileapi::AsyncFileUtil::EntryList& file_list,
+    const storage::AsyncFileUtil::EntryList& file_list,
     bool has_more) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(callback_, result, file_list, has_more));
   container_->RemoveOperation(this);
 }
 
 PrivetFileSystemDetailsOperation::PrivetFileSystemDetailsOperation(
     const base::FilePath& full_path,
     content::BrowserContext* browser_context,
     PrivetFileSystemAsyncOperationContainer* container,
     PrivetFileSystemAttributeCache* attribute_cache,
-    const fileapi::AsyncFileUtil::GetFileInfoCallback& callback)
+    const storage::AsyncFileUtil::GetFileInfoCallback& callback)
     : core_(full_path, browser_context, this),
       full_path_(full_path),
       container_(container),
       attribute_cache_(attribute_cache),
       callback_(callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 PrivetFileSystemDetailsOperation::~PrivetFileSystemDetailsOperation() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ skipping 50 matching lines @@
     base::File::Error result,
     const base::File::Info& info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::BrowserThread::PostTask(content::BrowserThread::IO,
                                    FROM_HERE,
                                    base::Bind(callback_, result, info));
   container_->RemoveOperation(this);
 }
 
 }  // namespace local_discovery