Revert 256688 "Fix various issues in RedirectToFileResourceHandler."

trunk/src/net/base/mock_file_stream.cc

Index: trunk/src/net/base/mock_file_stream.cc
===================================================================
--- trunk/src/net/base/mock_file_stream.cc	(revision 256703)
+++ trunk/src/net/base/mock_file_stream.cc	(working copy)
@@ -4,46 +4,10 @@
 
 #include "net/base/mock_file_stream.h"
 
-#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
-
 namespace net {
 
 namespace testing {
 
-MockFileStream::MockFileStream(net::NetLog* net_log)
-    : net::FileStream(net_log),
-      forced_error_(net::OK),
-      async_error_(false),
-      throttled_(false),
-      weak_factory_(this) {
-}
-
-MockFileStream::MockFileStream(base::PlatformFile file,
-                               int flags,
-                               net::NetLog* net_log)
-    : net::FileStream(file, flags, net_log),
-      forced_error_(net::OK),
-      async_error_(false),
-      throttled_(false),
-      weak_factory_(this) {
-}
-
-MockFileStream::MockFileStream(
-    base::PlatformFile file,
-    int flags,
-    net::NetLog* net_log,
-    const scoped_refptr<base::TaskRunner>& task_runner)
-    : net::FileStream(file, flags, net_log, task_runner),
-      forced_error_(net::OK),
-      async_error_(false),
-      throttled_(false),
-      weak_factory_(this) {
-}
-
-MockFileStream::~MockFileStream() {
-}
-
 int MockFileStream::OpenSync(const base::FilePath& path, int open_flags) {
   path_ = path;
   return ReturnError(FileStream::OpenSync(path, open_flags));
@@ -51,12 +15,7 @@
 
 int MockFileStream::Seek(Whence whence, int64 offset,
                          const Int64CompletionCallback& 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);
+  return ReturnError(FileStream::Seek(whence, offset, callback));
 }
 
 int64 MockFileStream::SeekSync(Whence whence, int64 offset) {
@@ -70,12 +29,7 @@
 int MockFileStream::Read(IOBuffer* buf,
                          int buf_len,
                          const CompletionCallback& 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);
+  return ReturnError(FileStream::Read(buf, buf_len, callback));
 }
 
 int MockFileStream::ReadSync(char* buf, int buf_len) {
@@ -89,12 +43,7 @@
 int MockFileStream::Write(IOBuffer* buf,
                           int buf_len,
                           const CompletionCallback& 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);
+  return ReturnError(FileStream::Write(buf, buf_len, callback));
 }
 
 int MockFileStream::WriteSync(const char* buf, int buf_len) {
@@ -106,80 +55,13 @@
 }
 
 int MockFileStream::Flush(const CompletionCallback& 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);
+  return ReturnError(FileStream::Flush(callback));
 }
 
 int MockFileStream::FlushSync() {
   return ReturnError(FileStream::FlushSync());
 }
 
-void MockFileStream::ThrottleCallbacks() {
-  CHECK(!throttled_);
-  throttled_ = true;
-}
-
-void MockFileStream::ReleaseCallbacks() {
-  CHECK(throttled_);
-  throttled_ = false;
-
-  if (!throttled_task_.is_null()) {
-    base::Closure throttled_task = throttled_task_;
-    throttled_task_.Reset();
-    base::MessageLoop::current()->PostTask(FROM_HERE, throttled_task);
-  }
-}
-
-void MockFileStream::DoCallback(const CompletionCallback& callback,
-                                int result) {
-  if (!throttled_) {
-    callback.Run(result);
-    return;
-  }
-  CHECK(throttled_task_.is_null());
-  throttled_task_ = base::Bind(callback, result);
-}
-
-void MockFileStream::DoCallback64(const Int64CompletionCallback& callback,
-                                  int64 result) {
-  if (!throttled_) {
-    callback.Run(result);
-    return;
-  }
-  CHECK(throttled_task_.is_null());
-  throttled_task_ = base::Bind(callback, result);
-}
-
-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_));
-    clear_forced_error();
-    return net::ERR_IO_PENDING;
-  }
-  int ret = forced_error_;
-  clear_forced_error();
-  return ret;
-}
-
-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_));
-    clear_forced_error();
-    return net::ERR_IO_PENDING;
-  }
-  int64 ret = forced_error_;
-  clear_forced_error();
-  return ret;
-}
-
 }  // namespace testing
 
 }  // namespace net