Refactor ResourceHandler API.

content/browser/loader/navigation_resource_handler.cc

 // Copyright 2014 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/navigation_resource_handler.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "content/browser/loader/navigation_url_loader_impl_core.h"
@@ skipping 55 matching lines @@
   // StreamHandle sent in OnResponseStarted.
   DetachFromCore();
   controller()->Resume();
 }
 
 void NavigationResourceHandler::SetController(ResourceController* controller) {
   writer_.set_controller(controller);
   ResourceHandler::SetController(controller);
 }
 
-bool NavigationResourceHandler::OnRequestRedirected(
+void NavigationResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
-    bool* defer) {
+    bool* defer_or_cancel) {
   DCHECK(core_);
 
   // TODO(davidben): Perform a CSP check here, and anything else that would have
   // been done renderer-side.
   NetLogObserver::PopulateResponseInfo(request(), response);
   response->head.encoded_data_length = request()->GetTotalReceivedBytes();
   core_->NotifyRequestRedirected(redirect_info, response);
-  *defer = true;
-  return true;
+  *defer_or_cancel = true;
 }
 
-bool NavigationResourceHandler::OnResponseStarted(ResourceResponse* response,
-                                                  bool* defer) {
+void NavigationResourceHandler::OnResponseStarted(ResourceResponse* response,
+                                                  bool* defer_or_cancel) {
   DCHECK(core_);
 
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   // If the MimeTypeResourceHandler intercepted this request and converted it
   // into a download, it will still call OnResponseStarted and immediately
   // cancel. Ignore the call; OnReadCompleted will happen shortly.
   //
   // TODO(davidben): Move the dispatch out of MimeTypeResourceHandler. Perhaps
   // all the way to the UI thread. Downloads, user certificates, etc., should be
   // dispatched at the navigation layer.
   if (info->IsDownload())
-    return true;
+    return;
 
   StreamContext* stream_context =
       GetStreamContextForResourceContext(info->GetContext());
   writer_.InitializeStream(stream_context->registry(),
                            request()->url().GetOrigin());
 
   NetLogObserver::PopulateResponseInfo(request(), response);
 
   std::unique_ptr<NavigationData> cloned_data;
   if (resource_dispatcher_host_delegate_) {
@@ skipping 14 matching lines @@
 
   core_->NotifyResponseStarted(response, writer_.stream()->CreateHandle(),
                                ssl_status, std::move(cloned_data));
   // Don't defer stream based requests. This includes requests initiated via
   // mime type sniffing, etc.
   // TODO(ananta)
   // Make sure that the requests go through the throttle checks. Currently this
   // does not work as the InterceptingResourceHandler is above us and hence it
   // does not expect the old handler to defer the request.
   if (!info->is_stream())
-    *defer = true;
-  return true;
+    *defer_or_cancel = true;
 }
 
-bool NavigationResourceHandler::OnWillStart(const GURL& url, bool* defer) {
-  return true;
-}
+void NavigationResourceHandler::OnWillStart(const GURL& url,
+                                            bool* defer_or_cancel) {}
 
 bool NavigationResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                                            int* buf_size,
                                            int min_size) {
   writer_.OnWillRead(buf, buf_size, min_size);
   return true;
 }
 
-bool NavigationResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
-  writer_.OnReadCompleted(bytes_read, defer);
-  return true;
+void NavigationResourceHandler::OnReadCompleted(int bytes_read,
+                                                bool* defer_or_cancel) {
+  writer_.OnReadCompleted(bytes_read, defer_or_cancel);
 }
 
 void NavigationResourceHandler::OnResponseCompleted(
     const net::URLRequestStatus& status,
     bool* defer) {
   // If the request has already committed, close the stream and leave it as-is.
   if (writer_.stream()) {
     writer_.Finalize(status.error());
     return;
   }
@@ skipping 10 matching lines @@
   NOTREACHED();
 }
 
 void NavigationResourceHandler::DetachFromCore() {
   DCHECK(core_);
   core_->set_resource_handler(nullptr);
   core_ = nullptr;
 }
 
 }  // namespace content