Fixed CHECKs for use of canceled ResourceContexts in ResourceDispatcherHostImpl.

content/browser/renderer_host/resource_dispatcher_host_impl.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 353 matching lines @@
 
 void ResourceDispatcherHostImpl::SetDelegate(
     ResourceDispatcherHostDelegate* delegate) {
   delegate_ = delegate;
 }
 
 void ResourceDispatcherHostImpl::SetAllowCrossOriginAuthPrompt(bool value) {
   allow_cross_origin_auth_prompt_ = value;
 }
 
+void ResourceDispatcherHostImpl::AddResourceContext(ResourceContext* context) {
+  active_resource_contexts_.insert(context);
+}
+
+void ResourceDispatcherHostImpl::RemoveResourceContext(
+    ResourceContext* context) {
+  CHECK(ContainsKey(active_resource_contexts_, context));
+  active_resource_contexts_.erase(context);
+}
+
 void ResourceDispatcherHostImpl::CancelRequestsForContext(
     ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(context);
 
-  canceled_resource_contexts_.insert(context);
+  CHECK(ContainsKey(active_resource_contexts_, context));
 
   // Note that request cancellation has side effects. Therefore, we gather all
   // the requests to cancel first, and then we start cancelling. We assert at
   // the end that there are no more to cancel since the context is about to go
   // away.
   std::vector<net::URLRequest*> requests_to_cancel;
   for (PendingRequestList::iterator i = pending_requests_.begin();
        i != pending_requests_.end();) {
     ResourceRequestInfoImpl* info =
         ResourceRequestInfoImpl::ForRequest(i->second);
@@ skipping 84 matching lines @@
     const DownloadStartedCallback& started_callback) {
   if (is_shutdown_)
     return CallbackAndReturn(started_callback, net::ERR_INSUFFICIENT_RESOURCES);
 
   const GURL& url = request->original_url();
 
   // http://crbug.com/90971
   char url_buf[128];
   base::strlcpy(url_buf, url.spec().c_str(), arraysize(url_buf));
   base::debug::Alias(url_buf);
-  CHECK(!ContainsKey(canceled_resource_contexts_, context));
+  CHECK(ContainsKey(active_resource_contexts_, context));
 
   const net::URLRequestContext* request_context = context->GetRequestContext();
   request->set_referrer(MaybeStripReferrer(GURL(request->referrer())).spec());
   request->set_context(request_context);
   int extra_load_flags = net::LOAD_IS_DOWNLOAD;
   if (prefer_cache) {
     // If there is upload data attached, only retrieve from cache because there
     // is no current mechanism to prompt the user for their consent for a
     // re-post. For GETs, try to retrieve data from the cache and skip
     // validating the entry if present.
@@ skipping 252 matching lines @@
   TransferredNavigations::iterator iter =
       transferred_navigations_.find(old_request_id);
   if (iter != transferred_navigations_.end()) {
     deferred_request = iter->second;
     pending_requests_.erase(old_request_id);
     transferred_navigations_.erase(iter);
   }
 
   ResourceContext* resource_context = filter_->resource_context();
   // http://crbug.com/90971
-  CHECK(!ContainsKey(canceled_resource_contexts_, resource_context));
+  CHECK(ContainsKey(active_resource_contexts_, resource_context));
 
   // Might need to resolve the blob references in the upload data.
   if (request_data.upload_data) {
     GetBlobStorageControllerForResourceContext(resource_context)->
         ResolveBlobReferencesInUploadData(request_data.upload_data.get());
   }
 
   if (is_shutdown_ ||
       !ShouldServiceRequest(process_type, child_id, request_data)) {
     AbortRequestBeforeItStarts(filter_, sync_result, route_id, request_id);
@@ skipping 385 matching lines @@
     int child_id,
     int route_id,
     ResourceContext* context) {
   if (is_shutdown_)
     return;
 
   // http://crbug.com/90971
   char url_buf[128];
   base::strlcpy(url_buf, url.spec().c_str(), arraysize(url_buf));
   base::debug::Alias(url_buf);
-  CHECK(!ContainsKey(canceled_resource_contexts_, context));
+  CHECK(ContainsKey(active_resource_contexts_, context));
 
   scoped_refptr<ResourceHandler> handler(
       new SaveFileResourceHandler(child_id,
                                   route_id,
                                   url,
                                   save_file_manager_.get()));
   request_id_--;
 
   const net::URLRequestContext* request_context = context->GetRequestContext();
   bool known_proto =
@@ skipping 1160 matching lines @@
   return allow_cross_origin_auth_prompt_;
 }
 
 bool ResourceDispatcherHostImpl::IsTransferredNavigation(
     const GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }
 
 }  // namespace content