Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: content/browser/download/base_file_unittest.cc

Issue 18286004: Move PathExists to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/download/base_file_posix.cc ('k') | content/browser/download/base_file_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/base_file_unittest.cc
diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc
index 8f37f59f78e4351a7f736fe171f60b337eab427e..415d756bc6c5ee0a183a37e85dc34f1f95bb7720 100644
--- a/content/browser/download/base_file_unittest.cc
+++ b/content/browser/download/base_file_unittest.cc
@@ -79,7 +79,7 @@ class BaseFileTest : public testing::Test {
// thread checks inside it.
base_file_.reset();
- EXPECT_EQ(expect_file_survives_, file_util::PathExists(full_path));
+ EXPECT_EQ(expect_file_survives_, base::PathExists(full_path));
}
void ResetHash() {
@@ -239,9 +239,9 @@ TEST_F(BaseFileTest, CreateDestroy) {
// Cancel the download explicitly.
TEST_F(BaseFileTest, Cancel) {
ASSERT_TRUE(InitializeFile());
- EXPECT_TRUE(file_util::PathExists(base_file_->full_path()));
+ EXPECT_TRUE(base::PathExists(base_file_->full_path()));
base_file_->Cancel();
- EXPECT_FALSE(file_util::PathExists(base_file_->full_path()));
+ EXPECT_FALSE(base::PathExists(base_file_->full_path()));
EXPECT_NE(base::FilePath().value(), base_file_->full_path().value());
}
@@ -284,15 +284,15 @@ TEST_F(BaseFileTest, WriteThenRenameAndDetach) {
ASSERT_TRUE(InitializeFile());
base::FilePath initial_path(base_file_->full_path());
- EXPECT_TRUE(file_util::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(initial_path));
base::FilePath new_path(temp_dir_.path().AppendASCII("NewFile"));
- EXPECT_FALSE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(new_path));
ASSERT_TRUE(AppendDataToFile(kTestData1));
EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, base_file_->Rename(new_path));
- EXPECT_FALSE(file_util::PathExists(initial_path));
- EXPECT_TRUE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(new_path));
base_file_->Finish();
base_file_->Detach();
@@ -422,16 +422,16 @@ TEST_F(BaseFileTest, WriteThenRename) {
ASSERT_TRUE(InitializeFile());
base::FilePath initial_path(base_file_->full_path());
- EXPECT_TRUE(file_util::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(initial_path));
base::FilePath new_path(temp_dir_.path().AppendASCII("NewFile"));
- EXPECT_FALSE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(new_path));
ASSERT_TRUE(AppendDataToFile(kTestData1));
EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE,
base_file_->Rename(new_path));
- EXPECT_FALSE(file_util::PathExists(initial_path));
- EXPECT_TRUE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(new_path));
base_file_->Finish();
}
@@ -441,16 +441,16 @@ TEST_F(BaseFileTest, RenameWhileInProgress) {
ASSERT_TRUE(InitializeFile());
base::FilePath initial_path(base_file_->full_path());
- EXPECT_TRUE(file_util::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(initial_path));
base::FilePath new_path(temp_dir_.path().AppendASCII("NewFile"));
- EXPECT_FALSE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(new_path));
ASSERT_TRUE(AppendDataToFile(kTestData1));
EXPECT_TRUE(base_file_->in_progress());
EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, base_file_->Rename(new_path));
- EXPECT_FALSE(file_util::PathExists(initial_path));
- EXPECT_TRUE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(initial_path));
+ EXPECT_TRUE(base::PathExists(new_path));
ASSERT_TRUE(AppendDataToFile(kTestData2));
@@ -467,7 +467,7 @@ TEST_F(BaseFileTest, RenameWithError) {
ASSERT_TRUE(file_util::CreateDirectory(test_dir));
base::FilePath new_path(test_dir.AppendASCII("TestFile"));
- EXPECT_FALSE(file_util::PathExists(new_path));
+ EXPECT_FALSE(base::PathExists(new_path));
{
file_util::PermissionRestorer restore_permissions_for(test_dir);
« no previous file with comments | « content/browser/download/base_file_posix.cc ('k') | content/browser/download/base_file_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698