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

net/base/network_delegate.cc

Index: net/base/network_delegate.cc
diff --git a/net/base/network_delegate.cc b/net/base/network_delegate.cc
index a2ca52b3769a287c9f120e454882a7e30739f3bb..4df6bd1531c834dc628d547dfd604c9bd4582b47 100644
--- a/net/base/network_delegate.cc
+++ b/net/base/network_delegate.cc
@@ -78,12 +78,32 @@ int NetworkDelegate::NotifyHeadersReceived(
                            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"),
@@ -107,6 +127,33 @@ void NetworkDelegate::NotifyBeforeRedirect(URLRequest* 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");
@@ -115,6 +162,7 @@ void NetworkDelegate::NotifyCompleted(URLRequest* request, bool started) {
   // 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);
 }