Fixed CHECKs for use of canceled ResourceContexts in ResourceDispatcherHostImpl.

content/browser/resource_context_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.
 
 #include "content/browser/resource_context_impl.h"
 
 #include "base/logging.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
@@ skipping 162 matching lines @@
   // TODO(jam): Add the ProtocolHandlerRegistryIntercepter here!
 }
 
 }  // namespace
 
 AppCacheService* ResourceContext::GetAppCacheService(ResourceContext* context) {
   return UserDataAdapter<ChromeAppCacheService>::Get(
       context, kAppCacheServicKeyName);
 }
 
+ResourceContext::ResourceContext() {
+  if (ResourceDispatcherHostImpl::Get())
+    ResourceDispatcherHostImpl::Get()->AddResourceContext(this);
+}
+
 ResourceContext::~ResourceContext() {
-  if (ResourceDispatcherHostImpl::Get())
-    ResourceDispatcherHostImpl::Get()->CancelRequestsForContext(this);
+  ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get();
+  if (rdhi) {
+    rdhi->CancelRequestsForContext(this);
+    rdhi->RemoveResourceContext(this);
+  }
 }
 
 BlobStorageController* GetBlobStorageControllerForResourceContext(
     ResourceContext* resource_context) {
   return GetChromeBlobStorageContextForResourceContext(resource_context)->
       controller();
 }
 
 DatabaseTracker* GetDatabaseTrackerForResourceContext(
     ResourceContext* resource_context) {
@@ skipping 69 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&InitializeRequestContext,
                    resource_context,
                    make_scoped_refptr(
                        browser_context->GetRequestContextForMedia())));
   }
 }
 
 }  // namespace content