diff options
Diffstat (limited to 'chromium/net/base/upload_file_element_reader_unittest.cc')
| -rw-r--r-- | chromium/net/base/upload_file_element_reader_unittest.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/chromium/net/base/upload_file_element_reader_unittest.cc b/chromium/net/base/upload_file_element_reader_unittest.cc index b0435019e9c..f3ccb4180f9 100644 --- a/chromium/net/base/upload_file_element_reader_unittest.cc +++ b/chromium/net/base/upload_file_element_reader_unittest.cc @@ -26,8 +26,8 @@ class UploadFileElementReaderTest : public PlatformTest { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(), - &temp_file_path_)); + ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), + &temp_file_path_)); ASSERT_EQ( static_cast<int>(bytes_.size()), file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size())); @@ -205,7 +205,7 @@ TEST_F(UploadFileElementReaderTest, Range) { TEST_F(UploadFileElementReaderTest, FileChanged) { base::PlatformFileInfo info; - ASSERT_TRUE(file_util::GetFileInfo(temp_file_path_, &info)); + ASSERT_TRUE(base::GetFileInfo(temp_file_path_, &info)); // Expect one second before the actual modification time to simulate change. const base::Time expected_modification_time = @@ -231,9 +231,7 @@ TEST_F(UploadFileElementReaderTest, WrongPath) { base::Time())); TestCompletionCallback init_callback; ASSERT_EQ(ERR_IO_PENDING, reader_->Init(init_callback.callback())); - EXPECT_EQ(OK, init_callback.WaitForResult()); - EXPECT_EQ(0U, reader_->GetContentLength()); - EXPECT_EQ(0U, reader_->BytesRemaining()); + EXPECT_EQ(ERR_FILE_NOT_FOUND, init_callback.WaitForResult()); } @@ -246,8 +244,8 @@ class UploadFileElementReaderSyncTest : public PlatformTest { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(), - &temp_file_path_)); + ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), + &temp_file_path_)); ASSERT_EQ( static_cast<int>(bytes_.size()), file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size())); @@ -352,7 +350,7 @@ TEST_F(UploadFileElementReaderSyncTest, Range) { TEST_F(UploadFileElementReaderSyncTest, FileChanged) { base::PlatformFileInfo info; - ASSERT_TRUE(file_util::GetFileInfo(temp_file_path_, &info)); + ASSERT_TRUE(base::GetFileInfo(temp_file_path_, &info)); // Expect one second before the actual modification time to simulate change. const base::Time expected_modification_time = @@ -366,9 +364,7 @@ TEST_F(UploadFileElementReaderSyncTest, WrongPath) { const base::FilePath wrong_path(FILE_PATH_LITERAL("wrong_path")); reader_.reset(new UploadFileElementReaderSync( wrong_path, 0, kuint64max, base::Time())); - ASSERT_EQ(OK, reader_->Init(CompletionCallback())); - EXPECT_EQ(0U, reader_->GetContentLength()); - EXPECT_EQ(0U, reader_->BytesRemaining()); + ASSERT_EQ(ERR_FILE_NOT_FOUND, reader_->Init(CompletionCallback())); } } // namespace net |