Add buffering to MimeSniffingResourceHandler.

content/browser/loader/redirect_to_file_resource_handler.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 "content/browser/loader/redirect_to_file_resource_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader/temporary_file_stream.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
-#include "net/base/mime_sniffer.h"
 #include "net/base/net_errors.h"
 #include "storage/browser/blob/shareable_file_reference.h"
 
 using storage::ShareableFileReference;
 
 namespace {
 
 // This class is similar to identically named classes in AsyncResourceHandler
 // and MimeTypeResourceHandler, but not quite.
 // TODO(ncbray): generalize and unify these cases?
@@ skipping 156 matching lines @@
 }
 
 void RedirectToFileResourceHandler::OnWillRead(
     scoped_refptr<net::IOBuffer>* buf,
     int* buf_size,
     std::unique_ptr<ResourceController> controller) {
   if (buf_->capacity() < next_buffer_size_)
     buf_->SetCapacity(next_buffer_size_);
 
   // We should have paused this network request already if the buffer is full.
-  DCHECK(!BufIsFull());
+  DCHECK_GT(buf_->RemainingCapacity(), 0);
 
   *buf = buf_.get();
   *buf_size = buf_->RemainingCapacity();
 
   buf_write_pending_ = true;
   controller->Resume();
 }
 
 void RedirectToFileResourceHandler::OnReadCompleted(
     int bytes_read,
@@ skipping 141 matching lines @@
     if (rv == net::ERR_IO_PENDING)
       break;
     if (rv <= 0)
       return false;
     next_handler_->OnDataDownloaded(rv);
     write_cursor_ += rv;
   }
 
   // If the request was defered for a reason other than having been completed,
   // and the buffer has space, resume the request.
-  if (has_controller() && !completed_during_write_ && !BufIsFull()) {
+  if (has_controller() && !completed_during_write_ &&
+      buf_->RemainingCapacity() > 0) {
     request()->LogUnblocked();
     Resume();
   }
   return true;
 }
 
-bool RedirectToFileResourceHandler::BufIsFull() const {
-  // This is a hack to workaround MimeTypeResourceHandler's inability to
-  // deal with a ResourceHandler that returns a buffer size of less than
-  // 2 * net::kMaxBytesToSniff from its OnWillRead method.
-  // TODO(darin): Fix this retardation!
-  return buf_->RemainingCapacity() <= (2 * net::kMaxBytesToSniff);
-}
-
 }  // namespace content