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

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

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket_stream/socket_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tcp_client_socket_pool.h" 5 #include "net/socket/tcp_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "net/base/mock_host_resolver.h" 10 #include "net/base/mock_host_resolver.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 return new MockPendingClientSocket(true, true, 0); 238 return new MockPendingClientSocket(true, true, 0);
239 default: 239 default:
240 NOTREACHED(); 240 NOTREACHED();
241 return new MockClientSocket(); 241 return new MockClientSocket();
242 } 242 }
243 } 243 }
244 244
245 virtual SSLClientSocket* CreateSSLClientSocket( 245 virtual SSLClientSocket* CreateSSLClientSocket(
246 ClientSocketHandle* transport_socket, 246 ClientSocketHandle* transport_socket,
247 const std::string& hostname, 247 const std::string& hostname,
248 const SSLConfig& ssl_config, 248 const SSLConfig& ssl_config) {
249 SSLHostInfo* ssl_host_info) {
250 NOTIMPLEMENTED(); 249 NOTIMPLEMENTED();
251 delete ssl_host_info;
252 return NULL; 250 return NULL;
253 } 251 }
254 252
255 int allocation_count() const { return allocation_count_; } 253 int allocation_count() const { return allocation_count_; }
256 254
257 // Set the default ClientSocketType. 255 // Set the default ClientSocketType.
258 void set_client_socket_type(ClientSocketType type) { 256 void set_client_socket_type(ClientSocketType type) {
259 client_socket_type_ = type; 257 client_socket_type_ = type;
260 } 258 }
261 259
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 EXPECT_FALSE(handle.socket()); 894 EXPECT_FALSE(handle.socket());
897 handle.Reset(); 895 handle.Reset();
898 896
899 // Reset for the next case. 897 // Reset for the next case.
900 host_resolver_->set_synchronous_mode(false); 898 host_resolver_->set_synchronous_mode(false);
901 } 899 }
902 900
903 } // namespace 901 } // namespace
904 902
905 } // namespace net 903 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket_stream/socket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698