net: FileStream cleanup

net/base/file_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/file_stream.h"
 
 #include "net/base/file_stream_context.h"
 #include "net/base/net_errors.h"
 
 namespace net {
@@ skipping 12 matching lines @@
 }
 
 int FileStream::Open(const base::FilePath& path, int open_flags,
                      const CompletionCallback& callback) {
   if (IsOpen()) {
     DLOG(FATAL) << "File is already open!";
     return ERR_UNEXPECTED;
   }
 
   DCHECK(open_flags & base::File::FLAG_ASYNC);
-  context_->OpenAsync(path, open_flags, callback);
+  context_->Open(path, open_flags, callback);
   return ERR_IO_PENDING;
 }
 
 int FileStream::Close(const CompletionCallback& callback) {
-  context_->CloseAsync(callback);
+  context_->Close(callback);
   return ERR_IO_PENDING;
 }
 
 bool FileStream::IsOpen() const {
   return context_->file().IsValid();
 }
 
-int FileStream::Seek(Whence whence,
+int FileStream::Seek(base::File::Whence whence,
                      int64 offset,
                      const Int64CompletionCallback& callback) {
   if (!IsOpen())
     return ERR_UNEXPECTED;
 
-  context_->SeekAsync(whence, offset, callback);
+  context_->Seek(whence, offset, callback);
   return ERR_IO_PENDING;
 }
 
 int FileStream::Read(IOBuffer* buf,
                      int buf_len,
                      const CompletionCallback& callback) {
   if (!IsOpen())
     return ERR_UNEXPECTED;
 
   // read(..., 0) will return 0, which indicates end-of-file.
   DCHECK_GT(buf_len, 0);
 
-  return context_->ReadAsync(buf, buf_len, callback);
+  return context_->Read(buf, buf_len, callback);
+}
+
+int FileStream::ReadNonBlocking(IOBuffer* buf,
+                                int buf_len,
+                                const CompletionCallback& callback) {
+  if (!IsOpen())
+    return ERR_UNEXPECTED;
+
+  // read(..., 0) will return 0, which indicates end-of-file.
+  DCHECK_GT(buf_len, 0);
+
+  return context_->ReadNonBlocking(buf, buf_len, callback);
 }
 
 int FileStream::Write(IOBuffer* buf,
                       int buf_len,
                       const CompletionCallback& callback) {
   if (!IsOpen())
     return ERR_UNEXPECTED;
 
   // write(..., 0) will return 0, which indicates end-of-file.

[wtc, 2014/06/16 23:01:44]

This comment is wrong. A write byte count of 0 does not indicate end-of-file. So
I think this comment and the DCHECK_GT(buf_len, 0) can be removed.

If you remove this, please also remove lines 98-99.

[rvargas (doing something else), 2014/06/18 01:36:38]

Done.

   DCHECK_GT(buf_len, 0);
 
-  return context_->WriteAsync(buf, buf_len, callback);
+  return context_->Write(buf, buf_len, callback);
+}
+
+int FileStream::WriteNonBlocking(IOBuffer* buf,
+                                 int buf_len,
+                                 const CompletionCallback& callback) {
+  if (!IsOpen())
+    return ERR_UNEXPECTED;
+
+  // write(..., 0) will return 0, which indicates end-of-file.
+  DCHECK_GT(buf_len, 0);
+
+  return context_->WriteNonBlocking(buf, buf_len, callback);
 }
 
 int FileStream::Flush(const CompletionCallback& callback) {
   if (!IsOpen())
     return ERR_UNEXPECTED;
 
-  context_->FlushAsync(callback);
+  context_->Flush(callback);
   return ERR_IO_PENDING;
 }
 
 const base::File& FileStream::GetFileForTesting() const {
   return context_->file();
 }
 
 }  // namespace net