summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 22:28:01 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 22:28:01 +0000
commit0ecb66ab6e7d3bdea554a6b5f81c13632141ddcd (patch)
treed098d67019472e1ebb38290ecd884df24ca05886 /chrome/browser/renderer_host
parente122e6072c0fd97b990d08fae16b300d973456c9 (diff)
downloadchromium_src-0ecb66ab6e7d3bdea554a6b5f81c13632141ddcd.zip
chromium_src-0ecb66ab6e7d3bdea554a6b5f81c13632141ddcd.tar.gz
chromium_src-0ecb66ab6e7d3bdea554a6b5f81c13632141ddcd.tar.bz2
Fix silly DCHECK introduced by me in r44019.
TEST=none BUG=none Review URL: http://codereview.chromium.org/1625009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 894e99d..e2d40c6 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -1318,8 +1318,7 @@ void ResourceDispatcherHost::OnReadCompleted(URLRequest* request,
bool ResourceDispatcherHost::CompleteRead(URLRequest* request,
int* bytes_read) {
- DCHECK(request);
- if (!request->status().is_success()) {
+ if (!request || !request->status().is_success()) {
NOTREACHED();
return false;
}
@@ -1329,7 +1328,9 @@ bool ResourceDispatcherHost::CompleteRead(URLRequest* request,
bytes_read)) {
CancelRequest(info->child_id(), info->request_id(), false);
// Our callers assume |request| is valid after we return.
- DCHECK(request);
+ DCHECK(pending_requests_.find(
+ GlobalRequestID(info->child_id(), info->request_id())) !=
+ pending_requests_.end());
return false;
}