Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / diagnostics / sqlite_diagnostics.cc

diff --git a/src/chrome/browser/diagnostics/sqlite_diagnostics.cc b/src/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 6a92c9d..3f98caa 100644 (file)
--- a/src/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/src/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
 #include "base/base_paths.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
@@ -22,8 +22,8 @@
 #include "content/public/common/content_constants.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
+#include "storage/browser/database/database_tracker.h"
 #include "third_party/sqlite/sqlite3.h"
-#include "webkit/browser/database/database_tracker.h"
 
 namespace diagnostics {
 
@@ -44,7 +44,7 @@ class SqliteIntegrityTest : public DiagnosticsTest {
                       const base::FilePath& db_path)
       : DiagnosticsTest(id), flags_(flags), db_path_(db_path) {}
 
-  virtual bool RecoveryImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
+  bool RecoveryImpl(DiagnosticsModel::Observer* observer) override {
     int outcome_code = GetOutcomeCode();
     if (flags_ & REMOVE_IF_CORRUPT) {
       switch (outcome_code) {
@@ -69,7 +69,7 @@ class SqliteIntegrityTest : public DiagnosticsTest {
     return true;
   }
 
-  virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
+  bool ExecuteImpl(DiagnosticsModel::Observer* observer) override {
     // If we're given an absolute path, use it. If not, then assume it's under
     // the profile directory.
     base::FilePath path;
@@ -200,13 +200,6 @@ class SqliteIntegrityTest : public DiagnosticsTest {
 
 }  // namespace
 
-DiagnosticsTest* MakeSqliteArchivedHistoryDbTest() {
-  return new SqliteIntegrityTest(
-      SqliteIntegrityTest::NO_FLAGS_SET,
-      DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST,
-      base::FilePath(chrome::kArchivedHistoryFilename));
-}
-
 DiagnosticsTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST,
@@ -214,9 +207,9 @@ DiagnosticsTest* MakeSqliteCookiesDbTest() {
 }
 
 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,