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

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

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/socks_client_socket_pool.h ('k') | net/socket/socks_client_socket_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/socks_client_socket_pool.h" 5 #include "net/socket/socks_client_socket_pool.h"
6 6
7 #include "base/time.h" 7 #include "base/time.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 base_.RequestSockets(group_name, *casted_params, num_sockets, net_log); 233 base_.RequestSockets(group_name, *casted_params, num_sockets, net_log);
234 } 234 }
235 235
236 void SOCKSClientSocketPool::CancelRequest(const std::string& group_name, 236 void SOCKSClientSocketPool::CancelRequest(const std::string& group_name,
237 ClientSocketHandle* handle) { 237 ClientSocketHandle* handle) {
238 base_.CancelRequest(group_name, handle); 238 base_.CancelRequest(group_name, handle);
239 } 239 }
240 240
241 void SOCKSClientSocketPool::ReleaseSocket(const std::string& group_name, 241 void SOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
242 ClientSocket* socket, int id) { 242 StreamSocket* socket, int id) {
243 base_.ReleaseSocket(group_name, socket, id); 243 base_.ReleaseSocket(group_name, socket, id);
244 } 244 }
245 245
246 void SOCKSClientSocketPool::Flush() { 246 void SOCKSClientSocketPool::Flush() {
247 base_.Flush(); 247 base_.Flush();
248 } 248 }
249 249
250 void SOCKSClientSocketPool::CloseIdleSockets() { 250 void SOCKSClientSocketPool::CloseIdleSockets() {
251 base_.CloseIdleSockets(); 251 base_.CloseIdleSockets();
252 } 252 }
(...skipping 29 matching lines...) Expand all
282 282
283 base::TimeDelta SOCKSClientSocketPool::ConnectionTimeout() const { 283 base::TimeDelta SOCKSClientSocketPool::ConnectionTimeout() const {
284 return base_.ConnectionTimeout(); 284 return base_.ConnectionTimeout();
285 } 285 }
286 286
287 ClientSocketPoolHistograms* SOCKSClientSocketPool::histograms() const { 287 ClientSocketPoolHistograms* SOCKSClientSocketPool::histograms() const {
288 return base_.histograms(); 288 return base_.histograms();
289 }; 289 };
290 290
291 } // namespace net 291 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks_client_socket_pool.h ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698