| Index: net/base/file_stream_context.cc
|
| diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
|
| index 3e2c2e5fc2732d0279e0a1fb68be658b7df9d4af..874d8b25865c899fabe0a2c130ccf9eb5e1f8b3a 100644
|
| --- a/net/base/file_stream_context.cc
|
| +++ b/net/base/file_stream_context.cc
|
| @@ -27,14 +27,11 @@ void CallInt64ToInt(const CompletionCallback& callback, int64 result) {
|
|
|
| } // namespace
|
|
|
| -FileStream::Context::IOResult::IOResult()
|
| - : result(OK),
|
| - os_error(0) {
|
| +FileStream::Context::IOResult::IOResult() : result(OK), os_error(0) {
|
| }
|
|
|
| FileStream::Context::IOResult::IOResult(int64 result, int os_error)
|
| - : result(result),
|
| - os_error(os_error) {
|
| + : result(result), os_error(os_error) {
|
| }
|
|
|
| // static
|
| @@ -50,13 +47,11 @@ FileStream::Context::OpenResult::OpenResult() {
|
|
|
| FileStream::Context::OpenResult::OpenResult(base::File file,
|
| IOResult error_code)
|
| - : file(file.Pass()),
|
| - error_code(error_code) {
|
| + : file(file.Pass()), error_code(error_code) {
|
| }
|
|
|
| FileStream::Context::OpenResult::OpenResult(RValue other)
|
| - : file(other.object->file.Pass()),
|
| - error_code(other.object->error_code) {
|
| + : file(other.object->file.Pass()), error_code(other.object->error_code) {
|
| }
|
|
|
| FileStream::Context::OpenResult& FileStream::Context::OpenResult::operator=(
|
| @@ -124,9 +119,7 @@ void FileStream::Context::Seek(base::File::Whence whence,
|
| FROM_HERE,
|
| base::Bind(
|
| &Context::SeekFileImpl, base::Unretained(this), whence, offset),
|
| - base::Bind(&Context::OnAsyncCompleted,
|
| - base::Unretained(this),
|
| - callback));
|
| + base::Bind(&Context::OnAsyncCompleted, base::Unretained(this), callback));
|
| DCHECK(posted);
|
|
|
| async_in_progress_ = true;
|
| @@ -148,7 +141,8 @@ void FileStream::Context::Flush(const CompletionCallback& callback) {
|
| }
|
|
|
| FileStream::Context::OpenResult FileStream::Context::OpenFileImpl(
|
| - const base::FilePath& path, int open_flags) {
|
| + const base::FilePath& path,
|
| + int open_flags) {
|
| #if defined(OS_POSIX)
|
| // Always use blocking IO.
|
| open_flags &= ~base::File::FLAG_ASYNC;
|
|
|