diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 19:18:03 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 19:18:03 +0000 |
| commit | 137ad0c8acd634e11925bce6a605e51a989ac0ff (patch) | |
| tree | 608d5c5c7a409e77416a5d2a0f14ee83aca194d9 /net/http/http_network_transaction.cc | |
| parent | b0ba335675ec7a44de94f182720f16c7ee0c2a7f (diff) | |
| download | chromium_src-137ad0c8acd634e11925bce6a605e51a989ac0ff.zip chromium_src-137ad0c8acd634e11925bce6a605e51a989ac0ff.tar.gz chromium_src-137ad0c8acd634e11925bce6a605e51a989ac0ff.tar.bz2 | |
Reverting 12470.
caused purify errors
Review URL: http://codereview.chromium.org/45055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction.cc')
| -rw-r--r-- | net/http/http_network_transaction.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index c7ea56f..ae1d9fd 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -377,7 +377,7 @@ int HttpNetworkTransaction::DoLoop(int result) { next_state_ = STATE_NONE; switch (state) { case STATE_RESOLVE_PROXY: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.resolve_proxy", request_, request_->url.spec()); rv = DoResolveProxy(); break; @@ -386,7 +386,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.resolve_proxy", request_, request_->url.spec()); break; case STATE_INIT_CONNECTION: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.init_conn", request_, request_->url.spec()); rv = DoInitConnection(); break; @@ -395,7 +395,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.init_conn", request_, request_->url.spec()); break; case STATE_RESOLVE_HOST: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.resolve_host", request_, request_->url.spec()); rv = DoResolveHost(); break; @@ -404,7 +404,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.resolve_host", request_, request_->url.spec()); break; case STATE_CONNECT: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.connect", request_, request_->url.spec()); rv = DoConnect(); break; @@ -413,7 +413,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.connect", request_, request_->url.spec()); break; case STATE_SSL_CONNECT_OVER_TUNNEL: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.ssl_tunnel", request_, request_->url.spec()); rv = DoSSLConnectOverTunnel(); break; @@ -422,7 +422,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.ssl_tunnel", request_, request_->url.spec()); break; case STATE_WRITE_HEADERS: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.write_headers", request_, request_->url.spec()); rv = DoWriteHeaders(); break; @@ -431,7 +431,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.write_headers", request_, request_->url.spec()); break; case STATE_WRITE_BODY: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.write_body", request_, request_->url.spec()); rv = DoWriteBody(); break; @@ -440,7 +440,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.write_body", request_, request_->url.spec()); break; case STATE_READ_HEADERS: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.read_headers", request_, request_->url.spec()); rv = DoReadHeaders(); break; @@ -449,7 +449,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.read_headers", request_, request_->url.spec()); break; case STATE_READ_BODY: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.read_body", request_, request_->url.spec()); rv = DoReadBody(); break; @@ -458,7 +458,7 @@ int HttpNetworkTransaction::DoLoop(int result) { TRACE_EVENT_END("http.read_body", request_, request_->url.spec()); break; case STATE_DRAIN_BODY_FOR_AUTH_RESTART: - DCHECK_EQ(OK, rv); + DCHECK(rv == OK); TRACE_EVENT_BEGIN("http.drain_body_for_auth_restart", request_, request_->url.spec()); rv = DoDrainBodyForAuthRestart(); @@ -527,7 +527,7 @@ int HttpNetworkTransaction::DoInitConnection() { connection_group.append(request_->url.GetOrigin().spec()); DCHECK(!connection_group.empty()); - return connection_.Init(connection_group, request_->priority, &io_callback_); + return connection_.Init(connection_group, &io_callback_); } int HttpNetworkTransaction::DoInitConnectionComplete(int result) { |