From 26b99739600d03d3f9489d6258794ddab5a5982a Mon Sep 17 00:00:00 2001 From: "tedvessenes@gmail.com" Date: Sat, 28 Jan 2012 00:57:00 +0000 Subject: Convert use of int ms to TimeDelta in files owned by jar. R=jar@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9190027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119547 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/client_socket_pool_base.cc | 2 +- net/socket/client_socket_pool_base.h | 5 +-- net/socket/client_socket_pool_base_unittest.cc | 22 ++++++------ net/socket/socket_test_util.cc | 4 +-- .../transport_client_socket_pool_unittest.cc | 40 ++++++++++++---------- 5 files changed, 39 insertions(+), 34 deletions(-) (limited to 'net/socket') diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 93a3dee..d230ad4 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -1100,7 +1100,7 @@ void ClientSocketPoolBaseHelper::Group::StartBackupSocketTimer( FROM_HERE, base::Bind(&Group::OnBackupSocketTimerFired, weak_factory_.GetWeakPtr(), group_name, pool), - pool->ConnectRetryIntervalMs()); + pool->ConnectRetryInterval()); } bool ClientSocketPoolBaseHelper::Group::TryToUsePreconnectConnectJob() { diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 4efb43d..f550e42 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -277,10 +277,11 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper LoadState GetLoadState(const std::string& group_name, const ClientSocketHandle* handle) const; - int ConnectRetryIntervalMs() const { + base::TimeDelta ConnectRetryInterval() const { // TODO(mbelshe): Make this tuned dynamically based on measured RTT. // For now, just use the max retry interval. - return ClientSocketPool::kMaxConnectRetryIntervalMs; + return base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs); } int NumConnectJobsInGroup(const std::string& group_name) const { diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 23360f5..5cde58b 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -732,7 +732,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) { &client_socket_factory_, &log); ASSERT_EQ(ERR_IO_PENDING, job->Connect()); - base::PlatformThread::Sleep(1); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1)); EXPECT_EQ(ERR_TIMED_OUT, delegate.WaitForResult()); net::CapturingNetLog::EntryList entries; @@ -986,7 +986,7 @@ TEST_F(ClientSocketPoolBaseTest, TotalLimitCountsConnectingSockets) { // actually become pending until 2ms after they have been created. In order // to flush all tasks, we need to wait so that we know there are no // soon-to-be-pending tasks waiting. - base::PlatformThread::Sleep(10); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10)); MessageLoop::current()->RunAllPending(); // The next synchronous request should wait for its turn. @@ -1439,7 +1439,7 @@ class RequestSocketCallback : public TestCompletionCallbackBase { { MessageLoop::ScopedNestableTaskAllower nestable( MessageLoop::current()); - base::PlatformThread::Sleep(10); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10)); EXPECT_EQ(OK, next_job_callback.WaitForResult()); } break; @@ -2005,7 +2005,7 @@ TEST_F(ClientSocketPoolBaseTest, DisableCleanupTimer) { // The idle socket timeout value was set to 10 milliseconds. Wait 20 // milliseconds so the sockets timeout. - base::PlatformThread::Sleep(20); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20)); MessageLoop::current()->RunAllPending(); ASSERT_EQ(2, pool_->IdleSocketCount()); @@ -2082,7 +2082,7 @@ TEST_F(ClientSocketPoolBaseTest, CleanupTimedOutIdleSockets) { // actually become pending until 2ms after they have been created. In order // to flush all tasks, we need to wait so that we know there are no // soon-to-be-pending tasks waiting. - base::PlatformThread::Sleep(10); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10)); MessageLoop::current()->RunAllPending(); ASSERT_EQ(2, pool_->IdleSocketCount()); @@ -2509,8 +2509,8 @@ TEST_F(ClientSocketPoolBaseTest, BackupSocketCancelAtMaxSockets) { handle.Reset(); // Wait for the backup timer to fire (add some slop to ensure it fires) - base::PlatformThread::Sleep( - ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3)); MessageLoop::current()->RunAllPending(); EXPECT_EQ(kDefaultMaxSockets, client_socket_factory_.allocation_count()); @@ -2538,8 +2538,8 @@ TEST_F(ClientSocketPoolBaseTest, CancelBackupSocketAfterCancelingAllRequests) { // the backup time to see if it indeed got canceled. handle.Reset(); // Wait for the backup timer to fire (add some slop to ensure it fires) - base::PlatformThread::Sleep( - ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3)); MessageLoop::current()->RunAllPending(); ASSERT_TRUE(pool_->HasGroup("bar")); EXPECT_EQ(1, pool_->NumConnectJobsInGroup("bar")); @@ -2577,8 +2577,8 @@ TEST_F(ClientSocketPoolBaseTest, CancelBackupSocketAfterFinishingAllRequests) { handle.Reset(); EXPECT_EQ(OK, callback2.WaitForResult()); // Wait for the backup timer to fire (add some slop to ensure it fires) - base::PlatformThread::Sleep( - ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs / 2 * 3)); MessageLoop::current()->RunAllPending(); } diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index baca959..b8ac5ad 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -294,7 +294,7 @@ MockWriteResult DelayedSocketData::OnWrite(const std::string& data) { FROM_HERE, base::Bind(&DelayedSocketData::CompleteRead, weak_factory_.GetWeakPtr()), - 100); + base::TimeDelta::FromMilliseconds(100)); return rv; } @@ -385,7 +385,7 @@ MockWriteResult OrderedSocketData::OnWrite(const std::string& data) { FROM_HERE, base::Bind(&OrderedSocketData::CompleteRead, weak_factory_.GetWeakPtr()), - 100); + base::TimeDelta::FromMilliseconds(100)); } return StaticSocketDataProvider::OnWrite(data); } diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index d78c15e..858bae7 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -174,11 +174,11 @@ class MockPendingClientSocket : public StreamSocket { const AddressList& addrlist, bool should_connect, bool should_stall, - int delay_ms) + base::TimeDelta delay) : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), should_connect_(should_connect), should_stall_(should_stall), - delay_ms_(delay_ms), + delay_(delay), is_connected_(false), addrlist_(addrlist) {} @@ -188,7 +188,7 @@ class MockPendingClientSocket : public StreamSocket { FROM_HERE, base::Bind(&MockPendingClientSocket::DoCallback, weak_factory_.GetWeakPtr(), callback), - delay_ms_); + delay_); return ERR_IO_PENDING; } @@ -255,7 +255,7 @@ class MockPendingClientSocket : public StreamSocket { base::WeakPtrFactory weak_factory_; bool should_connect_; bool should_stall_; - int delay_ms_; + base::TimeDelta delay_; bool is_connected_; const AddressList addrlist_; BoundNetLog net_log_; @@ -278,7 +278,8 @@ class MockClientSocketFactory : public ClientSocketFactory { : allocation_count_(0), client_socket_type_(MOCK_CLIENT_SOCKET), client_socket_types_(NULL), client_socket_index_(0), client_socket_index_max_(0), - delay_ms_(ClientSocketPool::kMaxConnectRetryIntervalMs) {} + delay_(base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs)) {} virtual DatagramClientSocket* CreateDatagramClientSocket( DatagramSocket::BindType bind_type, @@ -307,13 +308,16 @@ class MockClientSocketFactory : public ClientSocketFactory { case MOCK_FAILING_CLIENT_SOCKET: return new MockFailingClientSocket(addresses); case MOCK_PENDING_CLIENT_SOCKET: - return new MockPendingClientSocket(addresses, true, false, 0); + return new MockPendingClientSocket( + addresses, true, false, base::TimeDelta()); case MOCK_PENDING_FAILING_CLIENT_SOCKET: - return new MockPendingClientSocket(addresses, false, false, 0); + return new MockPendingClientSocket( + addresses, false, false, base::TimeDelta()); case MOCK_DELAYED_CLIENT_SOCKET: - return new MockPendingClientSocket(addresses, true, false, delay_ms_); + return new MockPendingClientSocket(addresses, true, false, delay_); case MOCK_STALLED_CLIENT_SOCKET: - return new MockPendingClientSocket(addresses, true, true, 0); + return new MockPendingClientSocket( + addresses, true, true, base::TimeDelta()); default: NOTREACHED(); return new MockClientSocket(addresses); @@ -350,7 +354,7 @@ class MockClientSocketFactory : public ClientSocketFactory { client_socket_index_max_ = num_types; } - void set_delay_ms(int delay_ms) { delay_ms_ = delay_ms; } + void set_delay(base::TimeDelta delay) { delay_ = delay; } private: int allocation_count_; @@ -358,14 +362,14 @@ class MockClientSocketFactory : public ClientSocketFactory { ClientSocketType* client_socket_types_; int client_socket_index_; int client_socket_index_max_; - int delay_ms_; + base::TimeDelta delay_; }; class TransportClientSocketPoolTest : public testing::Test { protected: TransportClientSocketPoolTest() : connect_backup_jobs_enabled_( - ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(true)), + ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(true)), params_( new TransportSocketParams(HostPortPair("www.google.com", 80), kDefaultPriority, false, false)), @@ -948,8 +952,8 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketConnect) { MessageLoop::current()->RunAllPending(); // Wait for the backup socket timer to fire. - base::PlatformThread::Sleep( - ClientSocketPool::kMaxConnectRetryIntervalMs + 50); + base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds( + ClientSocketPool::kMaxConnectRetryIntervalMs + 50)); // Let the appropriate socket connect. MessageLoop::current()->RunAllPending(); @@ -1066,7 +1070,7 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) { }; client_socket_factory_.set_client_socket_types(case_types, 2); - client_socket_factory_.set_delay_ms(5000); + client_socket_factory_.set_delay(base::TimeDelta::FromSeconds(5)); EXPECT_EQ(0, pool_.IdleSocketCount()); @@ -1163,8 +1167,8 @@ TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv6FinishesFirst) { }; client_socket_factory_.set_client_socket_types(case_types, 2); - client_socket_factory_.set_delay_ms( - TransportConnectJob::kIPv6FallbackTimerInMs + 50); + client_socket_factory_.set_delay(base::TimeDelta::FromMilliseconds( + TransportConnectJob::kIPv6FallbackTimerInMs + 50)); // Resolve an AddressList with a IPv6 address first and then a IPv4 address. host_resolver_->rules()->AddIPLiteralRule( -- cgit v1.1