summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 20:55:30 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 20:55:30 +0000
commitc30a2ff98bc3a63f467096de9c8b725c28973887 (patch)
tree82b918951b4c2c436e685fbb97416b47364566b3 /net
parent9306bd5c15b12e5d5b9ae2879d6fb6c281ee63eb (diff)
downloadchromium_src-c30a2ff98bc3a63f467096de9c8b725c28973887.zip
chromium_src-c30a2ff98bc3a63f467096de9c8b725c28973887.tar.gz
chromium_src-c30a2ff98bc3a63f467096de9c8b725c28973887.tar.bz2
CHECK to make sure connection_group is never empty.
Testing to see if this is the reason we hit the CHECK(!group_name_.empty()) in ClientSocketHandle::GetLoadState(). BUG=http://crbug.com/15374 TEST=none Review URL: http://codereview.chromium.org/155150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_transaction.cc6
-rw-r--r--net/socket/client_socket_handle.cc1
2 files changed, 6 insertions, 1 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index c1d0cef..5d4c8dd 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -592,7 +592,11 @@ int HttpNetworkTransaction::DoInitConnection() {
if (proxy_mode_ != kHTTPProxy)
connection_group.append(request_->url.GetOrigin().spec());
- DCHECK(!connection_group.empty());
+ // TODO(willchan): Downgrade this back to a DCHECK after closing
+ // http://crbug.com/15374.
+ CHECK(!connection_group.empty()) << "URL: " << request_->url.GetOrigin()
+ << ", Host: " << host
+ << ", Port: " << port;
HostResolver::RequestInfo resolve_info(host, port);
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index 15f99a6..384d205 100644
--- a/net/socket/client_socket_handle.cc
+++ b/net/socket/client_socket_handle.cc
@@ -27,6 +27,7 @@ int ClientSocketHandle::Init(const std::string& group_name,
const HostResolver::RequestInfo& resolve_info,
int priority,
CompletionCallback* callback) {
+ CHECK(!group_name.empty());
ResetInternal(true);
group_name_ = group_name;
int rv = pool_->RequestSocket(