diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 17:36:07 +0000 |
commit | 7567484144da059e2c2c2a818b06660a5459052f (patch) | |
tree | a4ceafc7e890051c25dbdd54b170d0f5794dd229 /webkit/browser/database | |
parent | 8a25d54d6eb190a8b82479b5309a892c1080a372 (diff) | |
download | chromium_src-7567484144da059e2c2c2a818b06660a5459052f.zip chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.gz chromium_src-7567484144da059e2c2c2a818b06660a5459052f.tar.bz2 |
Move PathExists to base namespace.
BUG=
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/18286004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/database')
-rw-r--r-- | webkit/browser/database/database_tracker.cc | 2 | ||||
-rw-r--r-- | webkit/browser/database/database_tracker_unittest.cc | 28 | ||||
-rw-r--r-- | webkit/browser/database/vfs_backend.cc | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index aa6838b..ce155ca 100644 --- a/webkit/browser/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -468,7 +468,7 @@ bool DatabaseTracker::LazyInit() { const base::FilePath kTrackerDatabaseFullPath = db_dir_.Append(base::FilePath(kTrackerDatabaseFileName)); if (file_util::DirectoryExists(db_dir_) && - file_util::PathExists(kTrackerDatabaseFullPath) && + base::PathExists(kTrackerDatabaseFullPath) && (!db_->Open(kTrackerDatabaseFullPath) || !sql::MetaTable::DoesTableExist(db_.get()))) { db_->Close(); diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index 68dcf22..5c15154 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); } diff --git a/webkit/browser/database/vfs_backend.cc b/webkit/browser/database/vfs_backend.cc index 109664d..1f459f5 100644 --- a/webkit/browser/database/vfs_backend.cc +++ b/webkit/browser/database/vfs_backend.cc @@ -120,7 +120,7 @@ void VfsBackend::OpenTempFileInDirectory( // static int VfsBackend::DeleteFile(const base::FilePath& file_path, bool sync_dir) { - if (!file_util::PathExists(file_path)) + if (!base::PathExists(file_path)) return SQLITE_OK; if (!base::Delete(file_path, false)) return SQLITE_IOERR_DELETE; |