| Index: webkit/fileapi/file_writer_delegate_unittest.cc
|
| diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
|
| index 4281beee0d2659b6c2ba2c36394c6cb5f91362e3..b693e79ea69838be78e8b040ebd196bcd4e03175 100644
|
| --- a/webkit/fileapi/file_writer_delegate_unittest.cc
|
| +++ b/webkit/fileapi/file_writer_delegate_unittest.cc
|
| @@ -111,6 +111,13 @@ class FileWriterDelegateTest : public PlatformTest {
|
| request_.reset(new net::URLRequest(blob_url, file_writer_delegate_.get()));
|
| }
|
|
|
| + int64 GetFileSize() {
|
| + base::PlatformFileInfo info;
|
| + bool result = base::GetPlatformFileInfo(file_, &info);
|
| + EXPECT_EQ(base::PLATFORM_FILE_OK, result);
|
| + return info.size;
|
| + }
|
| +
|
| FileSystemOperation* CreateNewOperation(Result* result, int64 quota);
|
|
|
| static net::URLRequest::ProtocolFactory Factory;
|
| @@ -249,7 +256,7 @@ TEST_F(FileWriterDelegateTest, WriteSuccessWithoutQuotaLimit) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| ASSERT_EQ(kDataSize + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -271,7 +278,7 @@ TEST_F(FileWriterDelegateTest, WriteSuccessWithJustQuota) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| ASSERT_EQ(kAllowedGrowth + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -293,7 +300,7 @@ TEST_F(FileWriterDelegateTest, WriteFailureByQuota) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| ASSERT_EQ(kAllowedGrowth + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -315,7 +322,7 @@ TEST_F(FileWriterDelegateTest, WriteZeroBytesSuccessfullyWithZeroQuota) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| ASSERT_EQ(kAllowedGrowth + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -362,8 +369,8 @@ TEST_F(FileWriterDelegateTest, WriteSuccessWithoutQuotaLimitConcurrent) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| - file_writer_delegate2->Start(file2, request2.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| + file_writer_delegate2->Start(file2, GetFileSize(), request2.get());
|
| MessageLoop::current()->Run();
|
| if (!result_->complete() || !result2->complete())
|
| MessageLoop::current()->Run();
|
| @@ -398,7 +405,7 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) {
|
|
|
| ASSERT_EQ(FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| ASSERT_EQ(kDataSize + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -413,7 +420,7 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) {
|
| allowed_growth = 20;
|
| PrepareForWrite(kBlobURL, offset, allowed_growth);
|
|
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| EXPECT_EQ(kDataSize + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -429,7 +436,7 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) {
|
| allowed_growth = 55;
|
| PrepareForWrite(kBlobURL, offset, allowed_growth);
|
|
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| EXPECT_EQ(offset + kDataSize + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -445,7 +452,7 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) {
|
| PrepareForWrite(kBlobURL, offset, allowed_growth);
|
|
|
| int64 pre_write_usage = ComputeCurrentOriginUsage();
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| EXPECT_EQ(pre_write_usage + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
| @@ -462,7 +469,7 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) {
|
| allowed_growth = 10;
|
| PrepareForWrite(kBlobURL, offset, allowed_growth);
|
|
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| EXPECT_EQ(pre_write_usage + allowed_growth +
|
| FileSystemUsageCache::kUsageFileSize,
|
| @@ -496,7 +503,7 @@ TEST_F(FileWriterDelegateUnlimitedTest, WriteWithQuota) {
|
| PrepareForWrite(kBlobURL, 0, 10);
|
|
|
| // We shouldn't fail as the context is configured as 'unlimited'.
|
| - file_writer_delegate_->Start(file_, request_.get());
|
| + file_writer_delegate_->Start(file_, GetFileSize(), request_.get());
|
| MessageLoop::current()->Run();
|
| EXPECT_EQ(kDataSize + FileSystemUsageCache::kUsageFileSize,
|
| test_helper_.GetCachedOriginUsage());
|
|
|