Commit 3485d1a0 authored by mtomasz's avatar mtomasz Committed by Commit bot

[fsp] Remove length from the OnWriteFileOperation().

The length is already available as data.byteLength, where data is of
the ArrayBuffer type.

TBR=benwells@chromium.org
TEST=browser_tests, unit_tests: *FileSystemProvider*Write*
BUG=248427

Review URL: https://codereview.chromium.org/530373002

Cr-Commit-Position: refs/heads/master@{#293093}
parent 93c5de27
...@@ -40,7 +40,7 @@ bool WriteFile::Execute(int request_id) { ...@@ -40,7 +40,7 @@ bool WriteFile::Execute(int request_id) {
scoped_ptr<base::DictionaryValue> values(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> values(new base::DictionaryValue);
values->SetInteger("openRequestId", file_handle_); values->SetInteger("openRequestId", file_handle_);
values->SetDouble("offset", offset_); values->SetDouble("offset", offset_);
values->SetInteger("length", length_); // Length is not passed directly since it can be accessed via data.byteLength.
DCHECK(buffer_.get()); DCHECK(buffer_.get());
values->Set( values->Set(
......
...@@ -29,8 +29,8 @@ const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj"; ...@@ -29,8 +29,8 @@ const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
const char kFileSystemId[] = "testing-file-system"; const char kFileSystemId[] = "testing-file-system";
const int kRequestId = 2; const int kRequestId = 2;
const int kFileHandle = 3; const int kFileHandle = 3;
const char kWriteData[] = "Welcome to my world!";
const int kOffset = 10; const int kOffset = 10;
const int kLength = 5;
} // namespace } // namespace
...@@ -46,11 +46,11 @@ class FileSystemProviderOperationsWriteFileTest : public testing::Test { ...@@ -46,11 +46,11 @@ class FileSystemProviderOperationsWriteFileTest : public testing::Test {
"" /* display_name */, "" /* display_name */,
true /* writable */, true /* writable */,
base::FilePath() /* mount_path */); base::FilePath() /* mount_path */);
io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength)); io_buffer_ = make_scoped_refptr(new net::StringIOBuffer(kWriteData));
} }
ProvidedFileSystemInfo file_system_info_; ProvidedFileSystemInfo file_system_info_;
scoped_refptr<net::IOBuffer> io_buffer_; scoped_refptr<net::StringIOBuffer> io_buffer_;
}; };
TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) { TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) {
...@@ -62,7 +62,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) { ...@@ -62,7 +62,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) {
kFileHandle, kFileHandle,
io_buffer_.get(), io_buffer_.get(),
kOffset, kOffset,
kLength, io_buffer_->size(),
base::Bind(&util::LogStatusCallback, &callback_log)); base::Bind(&util::LogStatusCallback, &callback_log));
write_file.SetDispatchEventImplForTesting( write_file.SetDispatchEventImplForTesting(
base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
...@@ -97,9 +97,13 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) { ...@@ -97,9 +97,13 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute) {
EXPECT_TRUE(options->GetDouble("offset", &event_offset)); EXPECT_TRUE(options->GetDouble("offset", &event_offset));
EXPECT_EQ(kOffset, static_cast<double>(event_offset)); EXPECT_EQ(kOffset, static_cast<double>(event_offset));
int event_length = -1; base::BinaryValue* event_data = NULL;
EXPECT_TRUE(options->GetInteger("length", &event_length)); ASSERT_TRUE(options->GetBinary("data", &event_data));
EXPECT_EQ(kLength, event_length); EXPECT_EQ(static_cast<size_t>(io_buffer_->size()), event_data->GetSize());
char* const event_data_buffer = event_data->GetBuffer();
ASSERT_TRUE(event_data_buffer);
EXPECT_EQ(std::string(kWriteData),
std::string(event_data_buffer, event_data->GetSize()));
} }
TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_NoListener) { TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_NoListener) {
...@@ -111,7 +115,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_NoListener) { ...@@ -111,7 +115,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_NoListener) {
kFileHandle, kFileHandle,
io_buffer_.get(), io_buffer_.get(),
kOffset, kOffset,
kLength, io_buffer_->size(),
base::Bind(&util::LogStatusCallback, &callback_log)); base::Bind(&util::LogStatusCallback, &callback_log));
write_file.SetDispatchEventImplForTesting( write_file.SetDispatchEventImplForTesting(
base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
...@@ -136,7 +140,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_ReadOnly) { ...@@ -136,7 +140,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, Execute_ReadOnly) {
kFileHandle, kFileHandle,
io_buffer_.get(), io_buffer_.get(),
kOffset, kOffset,
kLength, io_buffer_->size(),
base::Bind(&util::LogStatusCallback, &callback_log)); base::Bind(&util::LogStatusCallback, &callback_log));
write_file.SetDispatchEventImplForTesting( write_file.SetDispatchEventImplForTesting(
base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
...@@ -154,7 +158,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, OnSuccess) { ...@@ -154,7 +158,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, OnSuccess) {
kFileHandle, kFileHandle,
io_buffer_.get(), io_buffer_.get(),
kOffset, kOffset,
kLength, io_buffer_->size(),
base::Bind(&util::LogStatusCallback, &callback_log)); base::Bind(&util::LogStatusCallback, &callback_log));
write_file.SetDispatchEventImplForTesting( write_file.SetDispatchEventImplForTesting(
base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
...@@ -178,7 +182,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, OnError) { ...@@ -178,7 +182,7 @@ TEST_F(FileSystemProviderOperationsWriteFileTest, OnError) {
kFileHandle, kFileHandle,
io_buffer_.get(), io_buffer_.get(),
kOffset, kOffset,
kLength, io_buffer_->size(),
base::Bind(&util::LogStatusCallback, &callback_log)); base::Bind(&util::LogStatusCallback, &callback_log));
write_file.SetDispatchEventImplForTesting( write_file.SetDispatchEventImplForTesting(
base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
......
...@@ -176,7 +176,6 @@ namespace fileSystemProvider { ...@@ -176,7 +176,6 @@ namespace fileSystemProvider {
long requestId; long requestId;
long openRequestId; long openRequestId;
double offset; double offset;
double length;
ArrayBuffer data; ArrayBuffer data;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment