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

chrome/browser/diagnostics/sqlite_diagnostics.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/diagnostics/sqlite_diagnostics.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 189 matching lines @@
 
 }  // namespace
 
 DiagnosticsTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST,
                                  base::FilePath(chrome::kCookieFilename));
 }
 
 DiagnosticsTest* MakeSqliteWebDatabaseTrackerDbTest() {
-  base::FilePath databases_dir(webkit_database::kDatabaseDirectoryName);
+  base::FilePath databases_dir(storage::kDatabaseDirectoryName);
   base::FilePath tracker_db =
-      databases_dir.Append(webkit_database::kTrackerDatabaseFileName);
+      databases_dir.Append(storage::kTrackerDatabaseFileName);
   return new SqliteIntegrityTest(
       SqliteIntegrityTest::NO_FLAGS_SET,
       DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST,
       tracker_db);
 }
 
 DiagnosticsTest* MakeSqliteHistoryDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST,
                                  base::FilePath(chrome::kHistoryFilename));
@@ skipping 23 matching lines @@
                                  base::FilePath(chrome::kThumbnailsFilename));
 }
 
 DiagnosticsTest* MakeSqliteWebDataDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST,
                                  base::FilePath(kWebDataFilename));
 }
 
 }  // namespace diagnostics