Fix regression from r317126 that caused a DCHECK in ResourceDispatcher.

content/child/web_url_loader_impl.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/child/web_url_loader_impl.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 
@@ skipping 355 matching lines @@
       client_(NULL),
       resource_dispatcher_(resource_dispatcher),
       task_runner_(task_runner),
       referrer_policy_(blink::WebReferrerPolicyDefault),
       got_all_stream_body_data_(false),
       defers_loading_(NOT_DEFERRING),
       request_id_(-1) {
 }
 
 void WebURLLoaderImpl::Context::Cancel() {
-  if (resource_dispatcher_)  // NULL in unittest.
+  if (resource_dispatcher_ && // NULL in unittest.
+      request_id_ != -1) {
     resource_dispatcher_->Cancel(request_id_);

[Ken Russell (switch to Gerrit), 2015/02/20 17:52:51]

Is it OK that we'll potentially send a -1 request_id_ to
resource_dispatcher_->Cancel() now?

[jam, 2015/02/20 17:56:29]

How could that happen? This if statement is guarded by a check against -1.

[Ken Russell (switch to Gerrit), 2015/02/20 17:57:30]

Ah, sorry, I read the diffs backward and thought you had removed the test
against -1.

+    request_id_ = -1;
+  }
 
   // Ensure that we do not notify the multipart delegate anymore as it has
   // its own pointer to the client.
   if (multipart_delegate_)
     multipart_delegate_->Cancel();
   // Ditto for the ftp delegate.
   if (ftp_listing_delegate_)
     ftp_listing_delegate_->Cancel();
 
   // Do not make any further calls to the client.
   client_ = NULL;
   loader_ = NULL;
 }
 
 void WebURLLoaderImpl::Context::SetDefersLoading(bool value) {
-  resource_dispatcher_->SetDefersLoading(request_id_, value);
+  if (request_id_ != -1)
+    resource_dispatcher_->SetDefersLoading(request_id_, value);
   if (value && defers_loading_ == NOT_DEFERRING) {
     defers_loading_ = SHOULD_DEFER;
   } else if (!value && defers_loading_ != NOT_DEFERRING) {
     if (defers_loading_ == DEFERRED_DATA) {
       task_runner_->PostTask(FROM_HERE,
                              base::Bind(&Context::HandleDataURL, this));
     }
     defers_loading_ = NOT_DEFERRING;
   }
 }
 
 void WebURLLoaderImpl::Context::DidChangePriority(
     WebURLRequest::Priority new_priority, int intra_priority_value) {
-  resource_dispatcher_->DidChangePriority(
-      request_id_,
-      ConvertWebKitPriorityToNetPriority(new_priority),
-      intra_priority_value);
+  if (request_id_ != -1) {
+    resource_dispatcher_->DidChangePriority(
+        request_id_,
+        ConvertWebKitPriorityToNetPriority(new_priority),
+        intra_priority_value);
+  }
 }
 
 bool WebURLLoaderImpl::Context::AttachThreadedDataReceiver(
     blink::WebThreadedDataReceiver* threaded_data_receiver) {
-  resource_dispatcher_->AttachThreadedDataReceiver(
-      request_id_, threaded_data_receiver);
+  if (request_id_ != -1) {
+    resource_dispatcher_->AttachThreadedDataReceiver(
+        request_id_, threaded_data_receiver);
+  }
 
   return false;
 }
 
 void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
                                       SyncLoadResponse* sync_load_response) {
+  DCHECK(request_id_ == -1);
   request_ = request;  // Save the request.
   if (request.extraData()) {
     RequestExtraData* extra_data =
         static_cast<RequestExtraData*>(request.extraData());
     stream_override_ = extra_data->TakeStreamOverrideOwnership();
   }
 
   GURL url = request.url();
 
   // PlzNavigate: during navigation, the renderer should request a stream which
@@ skipping 702 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 bool WebURLLoaderImpl::attachThreadedDataReceiver(
     blink::WebThreadedDataReceiver* threaded_data_receiver) {
   return context_->AttachThreadedDataReceiver(threaded_data_receiver);
 }
 
 }  // namespace content