| Index: net/socket/client_socket_handle.h
|
| ===================================================================
|
| --- net/socket/client_socket_handle.h (revision 54615)
|
| +++ net/socket/client_socket_handle.h (working copy)
|
| @@ -109,9 +109,6 @@
|
| void set_ssl_error_response_info(const HttpResponseInfo& ssl_error_state) {
|
| ssl_error_response_info_ = ssl_error_state;
|
| }
|
| - void set_pending_http_proxy_connection(ClientSocketHandle* connection) {
|
| - pending_http_proxy_connection_.reset(connection);
|
| - }
|
|
|
| // Only valid if there is no |socket_|.
|
| bool is_ssl_error() const {
|
| @@ -124,9 +121,6 @@
|
| const HttpResponseInfo& ssl_error_response_info() const {
|
| return ssl_error_response_info_;
|
| }
|
| - ClientSocketHandle* release_pending_http_proxy_connection() {
|
| - return pending_http_proxy_connection_.release();
|
| - }
|
|
|
| // These may only be used if is_initialized() is true.
|
| const std::string& group_name() const { return group_name_; }
|
| @@ -185,7 +179,6 @@
|
| int pool_id_; // See ClientSocketPool::ReleaseSocket() for an explanation.
|
| bool is_ssl_error_;
|
| HttpResponseInfo ssl_error_response_info_;
|
| - scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
|
| base::TimeTicks init_time_;
|
| base::TimeDelta setup_time_;
|
|
|
|
|
| Property changes on: net\socket\client_socket_handle.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|