Commit 69377778 authored by shess's avatar shess Committed by Commit bot

[sql] Clients should use sql::Connection::Delete().

sql::Connection::Delete() covers associated journal files.

BUG=none

Review URL: https://codereview.chromium.org/1064523002

Cr-Commit-Position: refs/heads/master@{#324365}
parent e9f7a955
...@@ -56,7 +56,7 @@ class SqliteIntegrityTest : public DiagnosticsTest { ...@@ -56,7 +56,7 @@ class SqliteIntegrityTest : public DiagnosticsTest {
case DIAG_SQLITE_DB_CORRUPTED: case DIAG_SQLITE_DB_CORRUPTED:
LOG(WARNING) << "Removing broken SQLite database: " LOG(WARNING) << "Removing broken SQLite database: "
<< db_path_.value(); << db_path_.value();
base::DeleteFile(db_path_, false); sql::Connection::Delete(db_path_);
break; break;
case DIAG_SQLITE_SUCCESS: case DIAG_SQLITE_SUCCESS:
case DIAG_SQLITE_FILE_NOT_FOUND_OK: case DIAG_SQLITE_FILE_NOT_FOUND_OK:
......
...@@ -174,7 +174,7 @@ TEST_F(ActivityDatabaseTest, Init) { ...@@ -174,7 +174,7 @@ TEST_F(ActivityDatabaseTest, Init) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityInit.db"); db_file = temp_dir.path().AppendASCII("ActivityInit.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
ActivityDatabase* activity_db = OpenDatabase(db_file); ActivityDatabase* activity_db = OpenDatabase(db_file);
activity_db->Close(); activity_db->Close();
...@@ -191,7 +191,7 @@ TEST_F(ActivityDatabaseTest, RecordAction) { ...@@ -191,7 +191,7 @@ TEST_F(ActivityDatabaseTest, RecordAction) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityRecord.db"); db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
ActivityDatabase* activity_db = OpenDatabase(db_file); ActivityDatabase* activity_db = OpenDatabase(db_file);
activity_db->SetBatchModeForTesting(false); activity_db->SetBatchModeForTesting(false);
...@@ -210,7 +210,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOff) { ...@@ -210,7 +210,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOff) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityRecord.db"); db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
// Record some actions // Record some actions
ActivityDatabase* activity_db = OpenDatabase(db_file); ActivityDatabase* activity_db = OpenDatabase(db_file);
...@@ -228,7 +228,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOn) { ...@@ -228,7 +228,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOn) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityRecord.db"); db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
// Record some actions // Record some actions
ActivityDatabase* activity_db = OpenDatabase(db_file); ActivityDatabase* activity_db = OpenDatabase(db_file);
...@@ -250,7 +250,7 @@ TEST_F(ActivityDatabaseTest, BatchModeFlush) { ...@@ -250,7 +250,7 @@ TEST_F(ActivityDatabaseTest, BatchModeFlush) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityFlush.db"); db_file = temp_dir.path().AppendASCII("ActivityFlush.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
// Record some actions // Record some actions
ActivityDatabase* activity_db = OpenDatabase(db_file); ActivityDatabase* activity_db = OpenDatabase(db_file);
...@@ -272,7 +272,7 @@ TEST_F(ActivityDatabaseTest, InitFailure) { ...@@ -272,7 +272,7 @@ TEST_F(ActivityDatabaseTest, InitFailure) {
base::FilePath db_file; base::FilePath db_file;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
db_file = temp_dir.path().AppendASCII("ActivityRecord.db"); db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
base::DeleteFile(db_file, false); sql::Connection::Delete(db_file);
ActivityDatabaseTestPolicy* delegate = new ActivityDatabaseTestPolicy(); ActivityDatabaseTestPolicy* delegate = new ActivityDatabaseTestPolicy();
ActivityDatabase* activity_db = new ActivityDatabase(delegate); ActivityDatabase* activity_db = new ActivityDatabase(delegate);
......
...@@ -1141,7 +1141,7 @@ class LoginDatabaseMigrationTest : public testing::TestWithParam<int> { ...@@ -1141,7 +1141,7 @@ class LoginDatabaseMigrationTest : public testing::TestWithParam<int> {
void DestroyDatabase() { void DestroyDatabase() {
if (!database_path_.empty()) if (!database_path_.empty())
base::DeleteFile(database_path_, false); sql::Connection::Delete(database_path_);
} }
// Returns an empty vector on failure. Otherwise returns the values of the // Returns an empty vector on failure. Otherwise returns the values of the
......
...@@ -951,7 +951,7 @@ bool SQLitePersistentCookieStore::Backend::EnsureDatabaseVersion() { ...@@ -951,7 +951,7 @@ bool SQLitePersistentCookieStore::Backend::EnsureDatabaseVersion() {
meta_table_.Reset(); meta_table_.Reset();
db_.reset(new sql::Connection); db_.reset(new sql::Connection);
if (!base::DeleteFile(path_, false) || if (!sql::Connection::Delete(path_) ||
!db_->Open(path_) || !db_->Open(path_) ||
!meta_table_.Init( !meta_table_.Init(
db_.get(), kCurrentVersionNumber, kCompatibleVersionNumber)) { db_.get(), kCurrentVersionNumber, kCompatibleVersionNumber)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment