Make URLRequest::Read to return net errors or bytes read instead of a bool

net/base/network_delegate.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/network_delegate.h"
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/trace_event/trace_event.h"
 #include "net/base/load_flags.h"
@@ skipping 60 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(original_response_headers);
   DCHECK(!callback.is_null());
   return OnHeadersReceived(request,
                            callback,
                            original_response_headers,
                            override_response_headers,
                            allowed_unsafe_redirect_url);
 }
 
+void NetworkDelegate::NotifyResponseStarted(URLRequest* request,
+                                            int net_error) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(request);
+
+  implemented_ = true;
+
+  OnResponseStarted(request, net_error);
+  if (!implemented_)
+    OnResponseStarted(request);
+}
+
+// Deprecated.
 void NetworkDelegate::NotifyResponseStarted(URLRequest* request) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnResponseStarted(request);
 }
 
+void NetworkDelegate::OnResponseStarted(URLRequest* request, int net_error) {
+  implemented_ = false;
+}
+
+// Deprecated
+void NetworkDelegate::OnResponseStarted(URLRequest* request) {}
+
 void NetworkDelegate::NotifyNetworkBytesReceived(URLRequest* request,
                                                  int64_t bytes_received) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("net"),
                "NetworkDelegate::NotifyNetworkBytesReceived");
   DCHECK(CalledOnValidThread());
   DCHECK_GT(bytes_received, 0);
   OnNetworkBytesReceived(request, bytes_received);
 }
 
 void NetworkDelegate::NotifyNetworkBytesSent(URLRequest* request,
                                              int64_t bytes_sent) {
   DCHECK(CalledOnValidThread());
   DCHECK_GT(bytes_sent, 0);
   OnNetworkBytesSent(request, bytes_sent);
 }
 
 void NetworkDelegate::NotifyBeforeRedirect(URLRequest* request,
                                            const GURL& new_location) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnBeforeRedirect(request, new_location);
 }
 
+void NetworkDelegate::NotifyCompleted(URLRequest* request,
+                                      bool started,
+                                      int net_error) {
+  TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("net"),
+               "NetworkDelegate::NotifyCompleted");
+  DCHECK(CalledOnValidThread());
+  DCHECK(request);
+  // TODO(cbentzel): Remove ScopedTracker below once crbug.com/475753 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION("475753 NetworkDelegate::OnCompleted"));
+  implemented_ = true;
+
+  OnCompleted(request, started, net_error);
+  if (!implemented_)
+    OnCompleted(request, started);
+}
+
+void NetworkDelegate::OnCompleted(URLRequest* request,
+                                  bool started,
+                                  int net_error) {
+  implemented_ = false;
+}
+
+// Deprecated.
+void NetworkDelegate::OnCompleted(URLRequest* request, bool started) {}
+
+// Deprecated.
 void NetworkDelegate::NotifyCompleted(URLRequest* request, bool started) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("net"),
                "NetworkDelegate::NotifyCompleted");
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   // TODO(cbentzel): Remove ScopedTracker below once crbug.com/475753 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("475753 NetworkDelegate::OnCompleted"));
+
   OnCompleted(request, started);
 }
 
 void NetworkDelegate::NotifyURLRequestDestroyed(URLRequest* request) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("net"),
                "NetworkDelegate::NotifyURLRequestDestroyed");
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnURLRequestDestroyed(request);
 }
@@ skipping 54 matching lines @@
 bool NetworkDelegate::CancelURLRequestWithPolicyViolatingReferrerHeader(
     const URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   DCHECK(CalledOnValidThread());
   return OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       request, target_url, referrer_url);
 }
 
 }  // namespace net