From a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 18 Dec 2013 16:25:09 +0000 Subject: Merge from Chromium at DEPS revision 240154 This commit was generated by merge_to_master.py. Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e --- content/browser/download/download_file_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content/browser/download/download_file_unittest.cc') diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index dcc0e424bd..141808685f 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -195,7 +195,7 @@ class DownloadFileTest : public testing::Test { void VerifyStreamAndSize() { ::testing::Mock::VerifyAndClearExpectations(input_stream_); int64 size; - EXPECT_TRUE(file_util::GetFileSize(download_file_->FullPath(), &size)); + EXPECT_TRUE(base::GetFileSize(download_file_->FullPath(), &size)); EXPECT_EQ(expected_data_.size(), static_cast(size)); } @@ -461,7 +461,7 @@ TEST_F(DownloadFileTest, RenameError) { // Create a subdirectory. base::FilePath tempdir( initial_path.DirName().Append(FILE_PATH_LITERAL("tempdir"))); - ASSERT_TRUE(file_util::CreateDirectory(tempdir)); + ASSERT_TRUE(base::CreateDirectory(tempdir)); base::FilePath target_path(tempdir.Append(initial_path.BaseName())); // Targets -- cgit v1.2.3