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

content/public/test/sandbox_file_system_test_helper.cc

 // 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.
 
 #include "content/public/test/sandbox_file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_file_system_context.h"
 #include "url/gurl.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
-using fileapi::FileSystemContext;
-using fileapi::FileSystemOperationContext;
-using fileapi::FileSystemOperationRunner;
-using fileapi::FileSystemURL;
+using storage::FileSystemContext;
+using storage::FileSystemOperationContext;
+using storage::FileSystemOperationRunner;
+using storage::FileSystemURL;
 
 namespace content {
 
 SandboxFileSystemTestHelper::SandboxFileSystemTestHelper(
     const GURL& origin,
-    fileapi::FileSystemType type)
+    storage::FileSystemType type)
     : origin_(origin), type_(type), file_util_(NULL) {
 }
 
 SandboxFileSystemTestHelper::SandboxFileSystemTestHelper()
     : origin_(GURL("http://foo.com")),
-      type_(fileapi::kFileSystemTypeTemporary),
+      type_(storage::kFileSystemTypeTemporary),
       file_util_(NULL) {
 }
 
 SandboxFileSystemTestHelper::~SandboxFileSystemTestHelper() {
 }
 
 void SandboxFileSystemTestHelper::SetUp(const base::FilePath& base_dir) {
   SetUp(base_dir, NULL);
 }
 
 void SandboxFileSystemTestHelper::SetUp(
     FileSystemContext* file_system_context) {
   file_system_context_ = file_system_context;
 
   SetUpFileSystem();
 }
 
 void SandboxFileSystemTestHelper::SetUp(
     const base::FilePath& base_dir,
-    quota::QuotaManagerProxy* quota_manager_proxy) {
+    storage::QuotaManagerProxy* quota_manager_proxy) {
   file_system_context_ = CreateFileSystemContextForTesting(
       quota_manager_proxy, base_dir);
 
   SetUpFileSystem();
 }
 
 void SandboxFileSystemTestHelper::TearDown() {
   file_system_context_ = NULL;
   base::RunLoop().RunUntilIdle();
 }
@@ skipping 30 matching lines @@
 int64 SandboxFileSystemTestHelper::GetCachedOriginUsage() const {
   return file_system_context_->GetQuotaUtil(type_)
       ->GetOriginUsageOnFileTaskRunner(
           file_system_context_.get(), origin_, type_);
 }
 
 int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() {
   usage_cache()->CloseCacheFiles();
   int64 size = base::ComputeDirectorySize(GetOriginRootPath());
   if (base::PathExists(GetUsageCachePath()))
-    size -= fileapi::FileSystemUsageCache::kUsageFileSize;
+    size -= storage::FileSystemUsageCache::kUsageFileSize;
   return size;
 }
 
 int64
 SandboxFileSystemTestHelper::ComputeCurrentDirectoryDatabaseUsage() {
   return base::ComputeDirectorySize(
       GetOriginRootPath().AppendASCII("Paths"));
 }
 
 FileSystemOperationRunner* SandboxFileSystemTestHelper::operation_runner() {
   return file_system_context_->operation_runner();
 }
 
 FileSystemOperationContext*
 SandboxFileSystemTestHelper::NewOperationContext() {
   DCHECK(file_system_context_.get());
   FileSystemOperationContext* context =
     new FileSystemOperationContext(file_system_context_.get());
   context->set_update_observers(
       *file_system_context_->GetUpdateObservers(type_));
   return context;
 }
 
 void SandboxFileSystemTestHelper::AddFileChangeObserver(
-    fileapi::FileChangeObserver* observer) {
+    storage::FileChangeObserver* observer) {
   file_system_context_->sandbox_backend()->GetQuotaUtil()->
       AddFileChangeObserver(type_, observer, NULL);
 }
 
-fileapi::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() {
+storage::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() {
   return file_system_context()->sandbox_delegate()->usage_cache();
 }
 
 void SandboxFileSystemTestHelper::SetUpFileSystem() {
   DCHECK(file_system_context_.get());
   DCHECK(file_system_context_->sandbox_backend()->CanHandleType(type_));
 
   file_util_ = file_system_context_->sandbox_delegate()->sync_file_util();
   DCHECK(file_util_);
 
   // Prepare the origin's root directory.
   file_system_context_->sandbox_delegate()->
       GetBaseDirectoryForOriginAndType(origin_, type_, true /* create */);
 
   // Initialize the usage cache file.
   base::FilePath usage_cache_path = GetUsageCachePath();
   if (!usage_cache_path.empty())
     usage_cache()->UpdateUsage(usage_cache_path, 0);
 }
 
 }  // namespace content