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

chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc

Index: chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index bbec15d9a682c8c1c064d8b34ffa1f691564f9d8..9eeb1b78cbf4e7237c006b67151003979764854e 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -30,9 +30,9 @@ const char kTestIdentifierExtension[] =
 class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
  public:
   virtual void CreateDatabases() {
-    webkit_database::DatabaseTracker* db_tracker =
-        BrowserContext::GetDefaultStoragePartition(browser()->profile())->
-            GetDatabaseTracker();
+    storage::DatabaseTracker* db_tracker =
+        BrowserContext::GetDefaultStoragePartition(browser()->profile())
+            ->GetDatabaseTracker();
     base::string16 db_name = base::ASCIIToUTF16("db");
     base::string16 description = base::ASCIIToUTF16("db_description");
     int64 size;
@@ -50,7 +50,7 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
         db_tracker->GetFullDBFilePath(kTestIdentifierExtension, db_name);
     base::CreateDirectory(db_path2.DirName());
     ASSERT_EQ(0, base::WriteFile(db_path2, NULL, 0));
-    std::vector<webkit_database::OriginInfo> origins;
+    std::vector<storage::OriginInfo> origins;
     db_tracker->GetAllOriginsInfo(&origins);
     ASSERT_EQ(2U, origins.size());
   }