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

chrome/browser/browsing_data/browsing_data_remover_unittest.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/browsing_data/browsing_data_remover.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 126 matching lines @@
   virtual ~TestStoragePartition() {}
 
   // content::StoragePartition implementation.
   virtual base::FilePath GetPath() OVERRIDE { return base::FilePath(); }
   virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE {
     return NULL;
   }
   virtual net::URLRequestContextGetter* GetMediaURLRequestContext() OVERRIDE {
     return NULL;
   }
-  virtual quota::QuotaManager* GetQuotaManager() OVERRIDE {
-    return NULL;
-  }
+  virtual storage::QuotaManager* GetQuotaManager() OVERRIDE { return NULL; }
   virtual content::AppCacheService* GetAppCacheService() OVERRIDE {
     return NULL;
   }
-  virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE {
+  virtual storage::FileSystemContext* GetFileSystemContext() OVERRIDE {
     return NULL;
   }
-  virtual webkit_database::DatabaseTracker* GetDatabaseTracker() OVERRIDE {
+  virtual storage::DatabaseTracker* GetDatabaseTracker() OVERRIDE {
     return NULL;
   }
   virtual content::DOMStorageContext* GetDOMStorageContext() OVERRIDE {
     return NULL;
   }
   virtual content::IndexedDBContext* GetIndexedDBContext() OVERRIDE {
     return NULL;
   }
   virtual content::ServiceWorkerContext* GetServiceWorkerContext() OVERRIDE {
     return NULL;
@@ skipping 653 matching lines @@
   MockExtensionSpecialStoragePolicy* CreateMockPolicy() {
 #if defined(ENABLE_EXTENSIONS)
     mock_policy_ = new MockExtensionSpecialStoragePolicy;
     return mock_policy_;
 #else
     NOTREACHED();
     return NULL;
 #endif
   }
 
-  quota::SpecialStoragePolicy* mock_policy() {
+  storage::SpecialStoragePolicy* mock_policy() {
 #if defined(ENABLE_EXTENSIONS)
     return mock_policy_;
 #else
     return NULL;
 #endif
   }
 
   // If |kOrigin1| is protected when extensions are enabled, the expected
   // result for tests where the OriginMatcherFunction result is variable.
   bool ShouldRemoveForProtectedOriginOne() const {
@@ skipping 991 matching lines @@
   EXPECT_EQ(1u, tester.clear_count());
   EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_NoMonitor) {
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_HISTORY |
       BrowsingDataRemover::REMOVE_COOKIES, false);
 }