| Index: chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| index edd14dd7fca825634b270474527980d5d96032c3..35d9d5a5b233db5f1840a7b04f352cdc5cd4a6dc 100644
|
| --- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| +++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| @@ -106,7 +106,7 @@ TEST_F(ActivityDatabaseTest, Init) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityInit.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| ActivityDatabase* activity_db = OpenDatabase(db_file);
|
| activity_db->Close();
|
| @@ -125,7 +125,7 @@ TEST_F(ActivityDatabaseTest, RecordAPIAction) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| ActivityDatabase* activity_db = OpenDatabase(db_file);
|
| activity_db->SetBatchModeForTesting(false);
|
| @@ -159,7 +159,7 @@ TEST_F(ActivityDatabaseTest, RecordDOMAction) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| ActivityDatabase* activity_db = OpenDatabase(db_file);
|
| activity_db->SetBatchModeForTesting(false);
|
| @@ -202,7 +202,7 @@ TEST_F(ActivityDatabaseTest, RecordBlockedAction) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| ActivityDatabase* activity_db = OpenDatabase(db_file);
|
| scoped_refptr<BlockedAction> action = new BlockedAction(
|
| @@ -236,7 +236,7 @@ TEST_F(ActivityDatabaseTest, GetTodaysActions) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| // Use a mock clock to ensure that events are not recorded on the wrong day
|
| // when the test is run close to local midnight.
|
| @@ -294,7 +294,7 @@ TEST_F(ActivityDatabaseTest, GetOlderActions) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| // Use a mock clock to ensure that events are not recorded on the wrong day
|
| // when the test is run close to local midnight.
|
| @@ -362,7 +362,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOff) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| // Use a mock clock to ensure that events are not recorded on the wrong day
|
| // when the test is run close to local midnight.
|
| @@ -394,7 +394,7 @@ TEST_F(ActivityDatabaseTest, BatchModeOn) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| // Use a mock clock to set the time, and a special timer to control the
|
| // timing and skip ahead in time.
|
| @@ -436,7 +436,7 @@ TEST_F(ActivityDatabaseTest, InitFailure) {
|
| base::FilePath db_file;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
|
| - base::Delete(db_file, false);
|
| + base::DeleteFile(db_file, false);
|
|
|
| ActivityDatabase* activity_db =
|
| new ActivityDatabase(new ActivityDatabaseTestPolicy());
|
|
|