Index: webkit/browser/database/database_tracker_unittest.cc |
diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc |
index 68dcf22ae62b8d08dc01ee5f923d6e7ef3aec099..5c15154bb90620b6c3303d20fcdd092a2fcf98a6 100644 |
--- a/webkit/browser/database/database_tracker_unittest.cc |
+++ b/webkit/browser/database/database_tracker_unittest.cc |
@@ -249,7 +249,7 @@ class DatabaseTracker_TestHelper_Test { |
tracker->DatabaseClosed(kOrigin1, kDB1); |
result = callback.GetResult(result); |
EXPECT_EQ(net::OK, result); |
- EXPECT_FALSE(file_util::PathExists( |
+ EXPECT_FALSE(base::PathExists( |
tracker->DatabaseDirectory().AppendASCII(kOrigin1))); |
// Recreate db1. |
@@ -285,12 +285,12 @@ class DatabaseTracker_TestHelper_Test { |
tracker->DatabaseClosed(kOrigin2, kDB2); |
result = callback.GetResult(result); |
EXPECT_EQ(net::OK, result); |
- EXPECT_FALSE(file_util::PathExists( |
+ EXPECT_FALSE(base::PathExists( |
tracker->DatabaseDirectory().AppendASCII(kOrigin1))); |
EXPECT_TRUE( |
- file_util::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); |
+ base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); |
EXPECT_TRUE( |
- file_util::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB3))); |
+ base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB3))); |
tracker->DatabaseClosed(kOrigin2, kDB3); |
tracker->RemoveObserver(&observer); |
@@ -613,13 +613,13 @@ class DatabaseTracker_TestHelper_Test { |
EXPECT_EQ(size_t(1), origins_info.size()); |
EXPECT_EQ(kOrigin1, origins_info[0].GetOriginIdentifier()); |
EXPECT_TRUE( |
- file_util::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); |
+ base::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); |
EXPECT_EQ(base::FilePath(), tracker->GetFullDBFilePath(kOrigin2, kDB2)); |
// The origin directory of kOrigin1 remains, but the origin directory of |
// kOrigin2 is deleted. |
- EXPECT_TRUE(file_util::PathExists(origin1_db_dir)); |
- EXPECT_FALSE(file_util::PathExists(origin2_db_dir)); |
+ EXPECT_TRUE(base::PathExists(origin1_db_dir)); |
+ EXPECT_FALSE(base::PathExists(origin2_db_dir)); |
} |
static void DatabaseTrackerSetForceKeepSessionState() { |
@@ -692,12 +692,12 @@ class DatabaseTracker_TestHelper_Test { |
// No origins were deleted. |
EXPECT_EQ(size_t(2), origins_info.size()); |
EXPECT_TRUE( |
- file_util::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); |
+ base::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); |
EXPECT_TRUE( |
- file_util::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); |
+ base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); |
- EXPECT_TRUE(file_util::PathExists(origin1_db_dir)); |
- EXPECT_TRUE(file_util::PathExists(origin2_db_dir)); |
+ EXPECT_TRUE(base::PathExists(origin1_db_dir)); |
+ EXPECT_TRUE(base::PathExists(origin2_db_dir)); |
} |
static void EmptyDatabaseNameIsValid() { |
@@ -794,12 +794,12 @@ class DatabaseTracker_TestHelper_Test { |
tracker->HandleSqliteError(kOriginId, kName, SQLITE_CORRUPT); |
EXPECT_TRUE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); |
EXPECT_TRUE(observer.DidReceiveNewNotification()); |
- EXPECT_TRUE(file_util::PathExists(spoof_db_file)); |
+ EXPECT_TRUE(base::PathExists(spoof_db_file)); |
// Verify that once closed, the file is deleted and the record in the |
// tracker db is removed. |
tracker->DatabaseClosed(kOriginId, kName); |
- EXPECT_FALSE(file_util::PathExists(spoof_db_file)); |
+ EXPECT_FALSE(base::PathExists(spoof_db_file)); |
EXPECT_TRUE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); |
// -------------------------------------------------------- |
@@ -819,7 +819,7 @@ class DatabaseTracker_TestHelper_Test { |
EXPECT_FALSE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); |
EXPECT_FALSE(observer.DidReceiveNewNotification()); |
EXPECT_TRUE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); |
- EXPECT_FALSE(file_util::PathExists(spoof_db_file2)); |
+ EXPECT_FALSE(base::PathExists(spoof_db_file2)); |
tracker->RemoveObserver(&observer); |
} |