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

Side by Side Diff: net/socket/transport_client_socket_pool_unittest.cc

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/transport_client_socket_pool.h" 5 #include "net/socket/transport_client_socket_pool.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/threading/platform_thread.h" 11 #include "base/threading/platform_thread.h"
12 #include "net/base/ip_endpoint.h" 12 #include "net/base/ip_endpoint.h"
13 #include "net/base/load_timing_info.h" 13 #include "net/base/load_timing_info.h"
14 #include "net/base/load_timing_info_test_util.h" 14 #include "net/base/load_timing_info_test_util.h"
15 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 #include "net/base/test_completion_callback.h" 17 #include "net/base/test_completion_callback.h"
18 #include "net/dns/mock_host_resolver.h" 18 #include "net/dns/mock_host_resolver.h"
19 #include "net/log/capturing_net_log.h" 19 #include "net/log/test_net_log.h"
20 #include "net/socket/client_socket_handle.h" 20 #include "net/socket/client_socket_handle.h"
21 #include "net/socket/socket_test_util.h" 21 #include "net/socket/socket_test_util.h"
22 #include "net/socket/stream_socket.h" 22 #include "net/socket/stream_socket.h"
23 #include "net/socket/transport_client_socket_pool_test_util.h" 23 #include "net/socket/transport_client_socket_pool_test_util.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 namespace net { 26 namespace net {
27 27
28 using internal::ClientSocketPoolBaseHelper; 28 using internal::ClientSocketPoolBaseHelper;
29 29
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 84
85 void ReleaseAllConnections(ClientSocketPoolTest::KeepAlive keep_alive) { 85 void ReleaseAllConnections(ClientSocketPoolTest::KeepAlive keep_alive) {
86 test_base_.ReleaseAllConnections(keep_alive); 86 test_base_.ReleaseAllConnections(keep_alive);
87 } 87 }
88 88
89 ScopedVector<TestSocketRequest>* requests() { return test_base_.requests(); } 89 ScopedVector<TestSocketRequest>* requests() { return test_base_.requests(); }
90 size_t completion_count() const { return test_base_.completion_count(); } 90 size_t completion_count() const { return test_base_.completion_count(); }
91 91
92 bool connect_backup_jobs_enabled_; 92 bool connect_backup_jobs_enabled_;
93 CapturingNetLog net_log_; 93 TestNetLog net_log_;
94 scoped_refptr<TransportSocketParams> params_; 94 scoped_refptr<TransportSocketParams> params_;
95 scoped_ptr<MockHostResolver> host_resolver_; 95 scoped_ptr<MockHostResolver> host_resolver_;
96 MockTransportClientSocketFactory client_socket_factory_; 96 MockTransportClientSocketFactory client_socket_factory_;
97 TransportClientSocketPool pool_; 97 TransportClientSocketPool pool_;
98 ClientSocketPoolTest test_base_; 98 ClientSocketPoolTest test_base_;
99 99
100 private: 100 private:
101 DISALLOW_COPY_AND_ASSIGN(TransportClientSocketPoolTest); 101 DISALLOW_COPY_AND_ASSIGN(TransportClientSocketPoolTest);
102 }; 102 };
103 103
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 handle.socket()->GetLocalAddress(&endpoint); 1091 handle.socket()->GetLocalAddress(&endpoint);
1092 EXPECT_EQ(kIPv6AddressSize, endpoint.address().size()); 1092 EXPECT_EQ(kIPv6AddressSize, endpoint.address().size());
1093 EXPECT_EQ(1, client_socket_factory_.allocation_count()); 1093 EXPECT_EQ(1, client_socket_factory_.allocation_count());
1094 // Verify that TCP FastOpen was not turned on for the socket. 1094 // Verify that TCP FastOpen was not turned on for the socket.
1095 EXPECT_FALSE(handle.socket()->UsingTCPFastOpen()); 1095 EXPECT_FALSE(handle.socket()->UsingTCPFastOpen());
1096 } 1096 }
1097 1097
1098 } // namespace 1098 } // namespace
1099 1099
1100 } // namespace net 1100 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/transport_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698