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

chrome/browser/browsing_data/browsing_data_database_helper_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
@@ skipping 12 matching lines @@
     TestCompletionCallback;
 
 const char kTestIdentifier1[] = "http_www.google.com_0";
 
 const char kTestIdentifierExtension[] =
   "chrome-extension_behllobkkfkfnphdnhnkndlbkcpglgmj_0";
 
 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;
     db_tracker->DatabaseOpened(kTestIdentifier1, db_name, description,
                                1, &size);
     db_tracker->DatabaseClosed(kTestIdentifier1, db_name);
     base::FilePath db_path1 =
         db_tracker->GetFullDBFilePath(kTestIdentifier1, db_name);
     base::CreateDirectory(db_path1.DirName());
     ASSERT_EQ(0, base::WriteFile(db_path1, NULL, 0));
     db_tracker->DatabaseOpened(kTestIdentifierExtension, db_name, description,
                                1, &size);
     db_tracker->DatabaseClosed(kTestIdentifierExtension, db_name);
     base::FilePath db_path2 =
         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());
   }
 };
 
 // Called back by BrowsingDataDatabaseHelper on the UI thread once the database
 // information has been retrieved.
 class StopTestOnCallback {
  public:
   explicit StopTestOnCallback(
@@ skipping 79 matching lines @@
                  base::Unretained(&callback)));
 
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(origin_str, result.begin()->identifier.ToString());
   EXPECT_STREQ(db, result.begin()->database_name.c_str());
 }
 }  // namespace