Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1575)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/socks_client_socket_pool_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/socket/socks_client_socket_pool.cc ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket_pool_unittest.cc
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index b2b8655ee220b7794287130cfe981f4720f75ef1..7c7b6602a07fefdc7459bf2bd196467985300ebf 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -41,23 +41,19 @@ void TestLoadTimingInfo(const ClientSocketHandle& handle) {
ExpectLoadTimingHasOnlyConnectionTimes(load_timing_info);
}
-
scoped_refptr<TransportSocketParams> CreateProxyHostParams() {
return new TransportSocketParams(
- HostPortPair("proxy", 80), false, false,
- OnHostResolutionCallback());
+ HostPortPair("proxy", 80), false, false, OnHostResolutionCallback());
}
scoped_refptr<SOCKSSocketParams> CreateSOCKSv4Params() {
return new SOCKSSocketParams(
- CreateProxyHostParams(), false /* socks_v5 */,
- HostPortPair("host", 80));
+ CreateProxyHostParams(), false /* socks_v5 */, HostPortPair("host", 80));
}
scoped_refptr<SOCKSSocketParams> CreateSOCKSv5Params() {
return new SOCKSSocketParams(
- CreateProxyHostParams(), true /* socks_v5 */,
- HostPortPair("host", 80));
+ CreateProxyHostParams(), true /* socks_v5 */, HostPortPair("host", 80));
}
class SOCKSClientSocketPoolTest : public testing::Test {
@@ -66,19 +62,19 @@ class SOCKSClientSocketPoolTest : public testing::Test {
public:
explicit SOCKS5MockData(IoMode mode) {
writes_.reset(new MockWrite[3]);
- writes_[0] = MockWrite(mode, kSOCKS5GreetRequest,
- kSOCKS5GreetRequestLength);
+ writes_[0] =
+ MockWrite(mode, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength);
writes_[1] = MockWrite(mode, kSOCKS5OkRequest, kSOCKS5OkRequestLength);
writes_[2] = MockWrite(mode, 0);
reads_.reset(new MockRead[3]);
- reads_[0] = MockRead(mode, kSOCKS5GreetResponse,
- kSOCKS5GreetResponseLength);
+ reads_[0] =
+ MockRead(mode, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength);
reads_[1] = MockRead(mode, kSOCKS5OkResponse, kSOCKS5OkResponseLength);
reads_[2] = MockRead(mode, 0);
- data_.reset(new StaticSocketDataProvider(reads_.get(), 3,
- writes_.get(), 3));
+ data_.reset(
+ new StaticSocketDataProvider(reads_.get(), 3, writes_.get(), 3));
}
SocketDataProvider* data_provider() { return data_.get(); }
@@ -91,17 +87,17 @@ class SOCKSClientSocketPoolTest : public testing::Test {
SOCKSClientSocketPoolTest()
: transport_histograms_("MockTCP"),
- transport_socket_pool_(
- kMaxSockets, kMaxSocketsPerGroup,
- &transport_histograms_,
- &transport_client_socket_factory_),
+ transport_socket_pool_(kMaxSockets,
+ kMaxSocketsPerGroup,
+ &transport_histograms_,
+ &transport_client_socket_factory_),
socks_histograms_("SOCKSUnitTest"),
- pool_(kMaxSockets, kMaxSocketsPerGroup,
+ pool_(kMaxSockets,
+ kMaxSocketsPerGroup,
&socks_histograms_,
&host_resolver_,
&transport_socket_pool_,
- NULL) {
- }
+ NULL) {}
virtual ~SOCKSClientSocketPoolTest() {}
@@ -132,8 +128,12 @@ TEST_F(SOCKSClientSocketPoolTest, Simple) {
transport_client_socket_factory_.AddSocketDataProvider(data.data_provider());
ClientSocketHandle handle;
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, CompletionCallback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ CompletionCallback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
@@ -152,8 +152,12 @@ TEST_F(SOCKSClientSocketPoolTest, SetSocketRequestPriorityOnInit) {
ClientSocketHandle handle;
EXPECT_EQ(OK,
- handle.Init("a", CreateSOCKSv5Params(), priority,
- CompletionCallback(), &pool_, BoundNetLog()));
+ handle.Init("a",
+ CreateSOCKSv5Params(),
+ priority,
+ CompletionCallback(),
+ &pool_,
+ BoundNetLog()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
handle.socket()->Disconnect();
}
@@ -171,8 +175,12 @@ TEST_F(SOCKSClientSocketPoolTest, SetResolvePriorityOnInit) {
ClientSocketHandle handle;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", CreateSOCKSv4Params(), priority,
- CompletionCallback(), &pool_, BoundNetLog()));
+ handle.Init("a",
+ CreateSOCKSv4Params(),
+ priority,
+ CompletionCallback(),
+ &pool_,
+ BoundNetLog()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
EXPECT_EQ(priority, host_resolver_.last_request_priority());
EXPECT_TRUE(handle.socket() == NULL);
@@ -185,8 +193,12 @@ TEST_F(SOCKSClientSocketPoolTest, Async) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, callback.callback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ callback.callback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -199,13 +211,17 @@ TEST_F(SOCKSClientSocketPoolTest, Async) {
TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) {
StaticSocketDataProvider socket_data;
- socket_data.set_connect_data(MockConnect(SYNCHRONOUS,
- ERR_CONNECTION_REFUSED));
+ socket_data.set_connect_data(
+ MockConnect(SYNCHRONOUS, ERR_CONNECTION_REFUSED));
transport_client_socket_factory_.AddSocketDataProvider(&socket_data);
ClientSocketHandle handle;
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, CompletionCallback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ CompletionCallback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -218,8 +234,12 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, callback.callback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ callback.callback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -231,7 +251,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) {
TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
MockRead failed_read[] = {
- MockRead(SYNCHRONOUS, 0),
+ MockRead(SYNCHRONOUS, 0),
};
StaticSocketDataProvider socket_data(
failed_read, arraysize(failed_read), NULL, 0);
@@ -240,8 +260,12 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
ClientSocketHandle handle;
EXPECT_EQ(0, transport_socket_pool_.release_count());
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, CompletionCallback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ CompletionCallback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(ERR_SOCKS_CONNECTION_FAILED, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -250,18 +274,22 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) {
MockRead failed_read[] = {
- MockRead(ASYNC, 0),
+ MockRead(ASYNC, 0),
};
StaticSocketDataProvider socket_data(
- failed_read, arraysize(failed_read), NULL, 0);
+ failed_read, arraysize(failed_read), NULL, 0);
socket_data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
transport_client_socket_factory_.AddSocketDataProvider(&socket_data);
TestCompletionCallback callback;
ClientSocketHandle handle;
EXPECT_EQ(0, transport_socket_pool_.release_count());
- int rv = handle.Init("a", CreateSOCKSv5Params(), LOW, callback.callback(),
- &pool_, BoundNetLog());
+ int rv = handle.Init("a",
+ CreateSOCKSv5Params(),
+ LOW,
+ callback.callback(),
+ &pool_,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
« net/base/mime_util_unittest.cc ('K') | « net/socket/socks_client_socket_pool.cc ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698