diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 03:39:36 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 03:39:36 +0000 |
commit | 81854c44c38df32b69393186007d4fe7ebb6c471 (patch) | |
tree | f7c81816ac395bc37e6ea69aeb4b56cb9c7d3431 /net/socket/tcp_client_socket_pool.cc | |
parent | cf0ee14c47a74c365e45bfba00eb2024b2e83b4f (diff) | |
download | chromium_src-81854c44c38df32b69393186007d4fe7ebb6c471.zip chromium_src-81854c44c38df32b69393186007d4fe7ebb6c471.tar.gz chromium_src-81854c44c38df32b69393186007d4fe7ebb6c471.tar.bz2 |
net: Fix incorrect style used in some enumerations.
Reason: They are using kConstantNaming, however the Chromium style is to use
UPPER_CASE_FOR_ENUMS.
Also convert some truly constants, like the following:
http/http_proxy_client_socket_pool.h:
enum { kDrainBodyBufferSize = 1024 };
To:
static const int kDrainBodyBufferSize = 1024;
BUG=55668
TEST=compiles locally.
Review URL: http://codereview.chromium.org/3421026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_pool.cc')
-rw-r--r-- | net/socket/tcp_client_socket_pool.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/socket/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc index f1f9b9c..b770f03 100644 --- a/net/socket/tcp_client_socket_pool.cc +++ b/net/socket/tcp_client_socket_pool.cc @@ -72,11 +72,11 @@ TCPConnectJob::~TCPConnectJob() { LoadState TCPConnectJob::GetLoadState() const { switch (next_state_) { - case kStateResolveHost: - case kStateResolveHostComplete: + case STATE_RESOLVE_HOST: + case STATE_RESOLVE_HOST_COMPLETE: return LOAD_STATE_RESOLVING_HOST; - case kStateTCPConnect: - case kStateTCPConnectComplete: + case STATE_TCP_CONNECT: + case STATE_TCP_CONNECT_COMPLETE: return LOAD_STATE_CONNECTING; default: NOTREACHED(); @@ -85,7 +85,7 @@ LoadState TCPConnectJob::GetLoadState() const { } int TCPConnectJob::ConnectInternal() { - next_state_ = kStateResolveHost; + next_state_ = STATE_RESOLVE_HOST; start_time_ = base::TimeTicks::Now(); return DoLoop(OK); } @@ -97,25 +97,25 @@ void TCPConnectJob::OnIOComplete(int result) { } int TCPConnectJob::DoLoop(int result) { - DCHECK_NE(next_state_, kStateNone); + DCHECK_NE(next_state_, STATE_NONE); int rv = result; do { State state = next_state_; - next_state_ = kStateNone; + next_state_ = STATE_NONE; switch (state) { - case kStateResolveHost: + case STATE_RESOLVE_HOST: DCHECK_EQ(OK, rv); rv = DoResolveHost(); break; - case kStateResolveHostComplete: + case STATE_RESOLVE_HOST_COMPLETE: rv = DoResolveHostComplete(rv); break; - case kStateTCPConnect: + case STATE_TCP_CONNECT: DCHECK_EQ(OK, rv); rv = DoTCPConnect(); break; - case kStateTCPConnectComplete: + case STATE_TCP_CONNECT_COMPLETE: rv = DoTCPConnectComplete(rv); break; default: @@ -123,25 +123,25 @@ int TCPConnectJob::DoLoop(int result) { rv = ERR_FAILED; break; } - } while (rv != ERR_IO_PENDING && next_state_ != kStateNone); + } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); return rv; } int TCPConnectJob::DoResolveHost() { - next_state_ = kStateResolveHostComplete; + next_state_ = STATE_RESOLVE_HOST_COMPLETE; return resolver_.Resolve(params_->destination(), &addresses_, &callback_, net_log()); } int TCPConnectJob::DoResolveHostComplete(int result) { if (result == OK) - next_state_ = kStateTCPConnect; + next_state_ = STATE_TCP_CONNECT; return result; } int TCPConnectJob::DoTCPConnect() { - next_state_ = kStateTCPConnectComplete; + next_state_ = STATE_TCP_CONNECT_COMPLETE; set_socket(client_socket_factory_->CreateTCPClientSocket( addresses_, net_log().net_log(), net_log().source())); connect_start_time_ = base::TimeTicks::Now(); |