Fix various issues in RedirectToFileResourceHandler.

net/base/mock_file_stream.cc

Index: net/base/mock_file_stream.cc
diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc
index d160f0c938583e307574fe5c1541ca66a6fe948c..71416c15b882dc32efa1757849559854bf893a18 100644
--- a/net/base/mock_file_stream.cc
+++ b/net/base/mock_file_stream.cc
@@ -4,10 +4,46 @@
 
 #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));
@@ -15,7 +51,12 @@ int MockFileStream::OpenSync(const base::FilePath& path, int open_flags) {
 
 int MockFileStream::Seek(Whence whence, int64 offset,
                          const Int64CompletionCallback& callback) {
-  return ReturnError(FileStream::Seek(whence, offset, 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);
 }
 
 int64 MockFileStream::SeekSync(Whence whence, int64 offset) {
@@ -29,7 +70,12 @@ int64 MockFileStream::Available() {
 int MockFileStream::Read(IOBuffer* buf,
                          int buf_len,
                          const CompletionCallback& callback) {
-  return ReturnError(FileStream::Read(buf, buf_len, 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);
 }
 
 int MockFileStream::ReadSync(char* buf, int buf_len) {
@@ -43,7 +89,12 @@ int MockFileStream::ReadUntilComplete(char *buf, int buf_len) {
 int MockFileStream::Write(IOBuffer* buf,
                           int buf_len,
                           const CompletionCallback& callback) {
-  return ReturnError(FileStream::Write(buf, buf_len, callback));
+  CompletionCallback wrapped_callback = base::Bind(&MockFileStream::DoCallback,
+                                                   weak_factory_.GetWeakPtr(),

[mmenke, 2013/12/04 20:55:48]

Does this weak factory do any good?  FileStream::Context seems to take care of
the orphaned case.

[davidben, 2013/12/04 22:44:04]

If the wrapped callback gets called in the ErrorCallback case, the callback
needs to get invalidated.

+                                                   callback);
+  if (forced_error_ == net::OK)
+    return FileStream::Write(buf, buf_len, wrapped_callback);

[mmenke, 2013/12/04 20:55:48]

Maybe:

int rv = FileStream::Write(buf, buf_len, wrapped_callback);
EXPECT_EQ(ERR_IO_PENDING, rv);
return rv;

Otherwise, throttling won't work, unless we're returning async errors.

[davidben, 2013/12/04 22:44:04]

Hrm, I'd been thinking that it wouldn't do anything on calls that happened to
return synchronously, but that's probably never actually what you want. I dunno,
piles of boilerplate. It certainly wont' do anything on the calls that actually
are synchronous.

+  return ErrorCallback(wrapped_callback);
 }
 
 int MockFileStream::WriteSync(const char* buf, int buf_len) {
@@ -55,13 +106,80 @@ int64 MockFileStream::Truncate(int64 bytes) {
 }
 
 int MockFileStream::Flush(const CompletionCallback& callback) {
-  return ReturnError(FileStream::Flush(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);
 }
 
 int MockFileStream::FlushSync() {
   return ReturnError(FileStream::FlushSync());
 }
 
+void MockFileStream::ThrottleCallbacks() {
+  DCHECK(!throttled_);

[mmenke, 2013/12/04 20:55:48]

These should probably be EXPECTs or CHECKs, so tryjobs will fail.

[davidben, 2013/12/04 22:44:04]

DCHECKs really don't run on try bots? That seems kinda silly. Done.

+  throttled_ = true;
+}
+
+void MockFileStream::ReleaseCallbacks() {
+  DCHECK(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;
+  }
+  DCHECK(throttled_task_.is_null());
+  throttled_task_ = base::Bind(callback, result);
+}
+
+void MockFileStream::DoCallback64(const Int64CompletionCallback& callback,
+                                  int64 result) {
+  if (!throttled_) {
+    callback.Run(result);
+    return;
+  }
+  DCHECK(throttled_task_.is_null());
+  throttled_task_ = base::Bind(callback, result);
+}
+
+int MockFileStream::ErrorCallback(const CompletionCallback& callback) {
+  DCHECK_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;
+  }

[mmenke, 2013/12/04 20:55:48]

DCHECK(!throttled_)?

+  int ret = forced_error_;
+  clear_forced_error();
+  return ret;
+}
+
+int64 MockFileStream::ErrorCallback64(const Int64CompletionCallback& callback) {
+  DCHECK_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;
+  }

[mmenke, 2013/12/04 20:55:48]

DCHECK(!throttled_)?

+  int64 ret = forced_error_;
+  clear_forced_error();
+  return ret;
+}
+
 }  // namespace testing
 
 }  // namespace net