diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:08 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:08 +0100 |
| commit | 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 (patch) | |
| tree | 8d824ad26fac42e008142b86aa9631b2be7e4705 /content/browser/download/base_file_unittest.cc | |
| parent | 4f7316adb45db5ec3c9c1181ba9510c004566df8 (diff) | |
| download | chromium_org-6e8cce623b6e4fe0c9e4af605d675dd9d0338c38.tar.gz | |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
Diffstat (limited to 'content/browser/download/base_file_unittest.cc')
| -rw-r--r-- | content/browser/download/base_file_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc index 8b45ce9ca0..b3f2e6ca98 100644 --- a/content/browser/download/base_file_unittest.cc +++ b/content/browser/download/base_file_unittest.cc @@ -467,8 +467,8 @@ TEST_F(BaseFileTest, RenameWithError) { EXPECT_FALSE(base::PathExists(new_path)); { - file_util::PermissionRestorer restore_permissions_for(test_dir); - ASSERT_TRUE(file_util::MakeFileUnwritable(test_dir)); + base::FilePermissionRestorer restore_permissions_for(test_dir); + ASSERT_TRUE(base::MakeFileUnwritable(test_dir)); EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED, base_file_->Rename(new_path)); } @@ -558,10 +558,10 @@ TEST_F(BaseFileTest, ReadonlyBaseFile) { base::FilePath readonly_file_name = CreateTestFile(); // Restore permissions to the file when we are done with this test. - file_util::PermissionRestorer restore_permissions(readonly_file_name); + base::FilePermissionRestorer restore_permissions(readonly_file_name); // Make it read-only. - EXPECT_TRUE(file_util::MakeFileUnwritable(readonly_file_name)); + EXPECT_TRUE(base::MakeFileUnwritable(readonly_file_name)); // Try to overwrite it. base_file_.reset(new BaseFile(readonly_file_name, |