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

chrome/browser/extensions/activity_log/activity_database_unittest.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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 156 matching lines @@
 
   ActivityDatabaseTestPolicy* db_delegate_;
 };
 
 // Check that the database is initialized properly.
 TEST_F(ActivityDatabaseTest, Init) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityInit.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   ActivityDatabase* activity_db = OpenDatabase(db_file);
   activity_db->Close();
 
   sql::Connection db;
   ASSERT_TRUE(db.Open(db_file));
   ASSERT_TRUE(db.DoesTableExist(ActivityDatabaseTestPolicy::kTableName));
   db.Close();
 }
 
 // Check that actions are recorded in the db.
 TEST_F(ActivityDatabaseTest, RecordAction) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   ActivityDatabase* activity_db = OpenDatabase(db_file);
   activity_db->SetBatchModeForTesting(false);
   scoped_refptr<Action> action = CreateAction(base::Time::Now(), "brewster");
   Record(activity_db, action);
   activity_db->Close();
 
   sql::Connection db;
   ASSERT_TRUE(db.Open(db_file));
 
   ASSERT_EQ(1, CountActions(&db, "brewster"));
 }
 
 TEST_F(ActivityDatabaseTest, BatchModeOff) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   // Record some actions
   ActivityDatabase* activity_db = OpenDatabase(db_file);
   activity_db->SetBatchModeForTesting(false);
 
   scoped_refptr<Action> action = CreateAction(base::Time::Now(), "brewster");
   Record(activity_db, action);
   ASSERT_EQ(1, CountActions(&activity_db->db_, "brewster"));
 
   activity_db->Close();
 }
 
 TEST_F(ActivityDatabaseTest, BatchModeOn) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   // Record some actions
   ActivityDatabase* activity_db = OpenDatabase(db_file);
   activity_db->SetBatchModeForTesting(true);
   scoped_refptr<Action> action = CreateAction(base::Time::Now(), "brewster");
   Record(activity_db, action);
   ASSERT_EQ(0, CountActions(&activity_db->db_, "brewster"));
 
   // Artificially trigger and then stop the timer.
   activity_db->SetTimerForTesting(0);
   base::MessageLoop::current()->RunUntilIdle();
   ASSERT_EQ(1, CountActions(&activity_db->db_, "brewster"));
 
   activity_db->Close();
 }
 
 TEST_F(ActivityDatabaseTest, BatchModeFlush) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityFlush.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   // Record some actions
   ActivityDatabase* activity_db = OpenDatabase(db_file);
   activity_db->SetBatchModeForTesting(true);
   scoped_refptr<Action> action = CreateAction(base::Time::Now(), "brewster");
   Record(activity_db, action);
   ASSERT_EQ(0, CountActions(&activity_db->db_, "brewster"));
 
   // Request an immediate database flush.
   activity_db->AdviseFlush(ActivityDatabase::kFlushImmediately);
   ASSERT_EQ(1, CountActions(&activity_db->db_, "brewster"));
 
   activity_db->Close();
 }
 
 // Check that nothing explodes if the DB isn't initialized.
 TEST_F(ActivityDatabaseTest, InitFailure) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
-  base::DeleteFile(db_file, false);
+  sql::Connection::Delete(db_file);
 
   ActivityDatabaseTestPolicy* delegate = new ActivityDatabaseTestPolicy();
   ActivityDatabase* activity_db = new ActivityDatabase(delegate);
   scoped_refptr<Action> action = new Action(
       "punky", base::Time::Now(), Action::ACTION_API_CALL, "brewster");
   action->mutable_args()->AppendString("woof");
   delegate->Record(activity_db, action);
   activity_db->Close();
 }
 
 }  // namespace extensions