diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-22 11:49:36 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-22 15:03:20 +0100 |
| commit | 4ceda5254f89dd540c17e037d7ede22b1817f4e2 (patch) | |
| tree | db2d29718cd70744120085a5196d5569a7eae62e /net/socket/tcp_client_socket_pool.cc | |
| parent | a8d393aaf9718c42d29078685fc0b94add05b863 (diff) | |
| download | external_chromium-4ceda5254f89dd540c17e037d7ede22b1817f4e2.zip external_chromium-4ceda5254f89dd540c17e037d7ede22b1817f4e2.tar.gz external_chromium-4ceda5254f89dd540c17e037d7ede22b1817f4e2.tar.bz2 | |
Syncing external/chromium with chromium release 61029, part 4
Removing code that is not needed anymore as the compile errors
have been fixed in more general ways.
Change-Id: I483d7b4a474db030cb10e446692326f739679fff
Diffstat (limited to 'net/socket/tcp_client_socket_pool.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_pool.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc index ce53fa5..89b000e 100644 --- a/net/socket/tcp_client_socket_pool.cc +++ b/net/socket/tcp_client_socket_pool.cc @@ -150,7 +150,6 @@ int TCPConnectJob::DoTCPConnect() { int TCPConnectJob::DoTCPConnectComplete(int result) { if (result == OK) { -#ifndef ANDROID DCHECK(connect_start_time_ != base::TimeTicks()); DCHECK(start_time_ != base::TimeTicks()); base::TimeTicks now = base::TimeTicks::Now(); @@ -168,7 +167,6 @@ int TCPConnectJob::DoTCPConnectComplete(int result) { base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10), 100); -#endif } else { // Delete the socket on error. set_socket(NULL); |