ResourceLoader: Fix a bunch of double-cancellation/double-error notification cases.

net/url_request/url_request_job.h

Index: net/url_request/url_request_job.h
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 288644e8124c681e090838d7741644cb4530d785..8f9021692088b29f3efb997e6107f4885d4b8a59 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -361,15 +361,18 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
   // |bytes_read| unfiltered bytes have been read for this job.
   void RecordBytesRead(int bytes_read);
 
-  // NotifyDone marks that request is done. It is really a glorified
+  // OnDone marks that request is done. It is really a glorified
   // set_status, but also does internal state checking and job tracking. It
   // should be called once per request, when the job is finished doing all IO.
-  void NotifyDone(const URLRequestStatus& status);
-
-  // Some work performed by NotifyDone must be completed asynchronously so
-  // as to avoid re-entering URLRequest::Delegate. This method performs that
-  // work.
-  void CompleteNotifyDone();
+  //
+  // If |notify_done| is true, will notify the URLRequest of completion.
+  // Otherwise, the caller will need to do this itself, possibly through a
+  // synchronous return value.
+  void OnDone(const URLRequestStatus& status, bool notify_done);
+
+  // Takes care of the notification initiated by OnDone() to avoid re-entering
+  // the URLRequest::Delegate.
+  void NotifyDone();
 
   // Subclasses may implement this method to record packet arrival times.
   // The default implementation does nothing.  Only invoked when bytes have been