| Index: net/base/mock_file_stream.cc
|
| diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc
|
| index a34edb218be9ed54cb8140aa4aa5db9ed9152507..478fe50e5127112e0e41606acc8d08ec0b5ac87c 100644
|
| --- a/net/base/mock_file_stream.cc
|
| +++ b/net/base/mock_file_stream.cc
|
| @@ -33,11 +33,11 @@ MockFileStream::MockFileStream(
|
| MockFileStream::~MockFileStream() {
|
| }
|
|
|
| -int MockFileStream::Seek(base::File::Whence whence, int64 offset,
|
| +int MockFileStream::Seek(base::File::Whence whence,
|
| + int64 offset,
|
| const Int64CompletionCallback& callback) {
|
| - Int64CompletionCallback wrapped_callback =
|
| - base::Bind(&MockFileStream::DoCallback64,
|
| - weak_factory_.GetWeakPtr(), callback);
|
| + Int64CompletionCallback wrapped_callback = base::Bind(
|
| + &MockFileStream::DoCallback64, weak_factory_.GetWeakPtr(), callback);
|
| if (forced_error_ == net::OK)
|
| return FileStream::Seek(whence, offset, wrapped_callback);
|
| return ErrorCallback64(wrapped_callback);
|
| @@ -46,9 +46,8 @@ int MockFileStream::Seek(base::File::Whence whence, int64 offset,
|
| int MockFileStream::Read(IOBuffer* buf,
|
| int buf_len,
|
| const CompletionCallback& callback) {
|
| - CompletionCallback wrapped_callback = base::Bind(&MockFileStream::DoCallback,
|
| - weak_factory_.GetWeakPtr(),
|
| - callback);
|
| + CompletionCallback wrapped_callback = base::Bind(
|
| + &MockFileStream::DoCallback, weak_factory_.GetWeakPtr(), callback);
|
| if (forced_error_ == net::OK)
|
| return FileStream::Read(buf, buf_len, wrapped_callback);
|
| return ErrorCallback(wrapped_callback);
|
| @@ -57,18 +56,16 @@ int MockFileStream::Read(IOBuffer* buf,
|
| int MockFileStream::Write(IOBuffer* buf,
|
| int buf_len,
|
| const CompletionCallback& callback) {
|
| - CompletionCallback wrapped_callback = base::Bind(&MockFileStream::DoCallback,
|
| - weak_factory_.GetWeakPtr(),
|
| - callback);
|
| + CompletionCallback wrapped_callback = base::Bind(
|
| + &MockFileStream::DoCallback, weak_factory_.GetWeakPtr(), callback);
|
| if (forced_error_ == net::OK)
|
| return FileStream::Write(buf, buf_len, wrapped_callback);
|
| return ErrorCallback(wrapped_callback);
|
| }
|
|
|
| int MockFileStream::Flush(const CompletionCallback& callback) {
|
| - CompletionCallback wrapped_callback = base::Bind(&MockFileStream::DoCallback,
|
| - weak_factory_.GetWeakPtr(),
|
| - callback);
|
| + CompletionCallback wrapped_callback = base::Bind(
|
| + &MockFileStream::DoCallback, weak_factory_.GetWeakPtr(), callback);
|
| if (forced_error_ == net::OK)
|
| return FileStream::Flush(wrapped_callback);
|
| return ErrorCallback(wrapped_callback);
|
| @@ -113,8 +110,8 @@ void MockFileStream::DoCallback64(const Int64CompletionCallback& callback,
|
| int MockFileStream::ErrorCallback(const CompletionCallback& callback) {
|
| CHECK_NE(net::OK, forced_error_);
|
| if (async_error_) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(callback, forced_error_));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, forced_error_));
|
| clear_forced_error();
|
| return net::ERR_IO_PENDING;
|
| }
|
| @@ -126,8 +123,8 @@ int MockFileStream::ErrorCallback(const CompletionCallback& callback) {
|
| int64 MockFileStream::ErrorCallback64(const Int64CompletionCallback& callback) {
|
| CHECK_NE(net::OK, forced_error_);
|
| if (async_error_) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(callback, forced_error_));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, forced_error_));
|
| clear_forced_error();
|
| return net::ERR_IO_PENDING;
|
| }
|
|
|