| Index: net/socket_stream/socket_stream.h
|
| diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
|
| index 03b1a182df6b827fa982357c63b3f87ec914413f..2a4f0d7c14a7897b7d4e41c84f36cd024cfa66dd 100644
|
| --- a/net/socket_stream/socket_stream.h
|
| +++ b/net/socket_stream/socket_stream.h
|
| @@ -258,7 +258,7 @@ class NET_EXPORT SocketStream
|
| // notifications will be sent to delegate.
|
| void Finish(int result);
|
|
|
| - int DidEstablishSSL(int result);
|
| + int DidEstablishSSL(int result, SSLConfig* ssl_config);
|
| int DidEstablishConnection();
|
| int DidReceiveData(int result);
|
| int DidSendData(int result);
|
| @@ -291,6 +291,7 @@ class NET_EXPORT SocketStream
|
|
|
| GURL ProxyAuthOrigin() const;
|
| int HandleAuthChallenge(const HttpResponseHeaders* headers);
|
| + int HandleCertificateRequest(int result);
|
| void DoAuthRequired();
|
| void DoRestartWithAuth();
|
|
|
| @@ -335,7 +336,8 @@ class NET_EXPORT SocketStream
|
| AddressList addresses_;
|
| scoped_ptr<StreamSocket> socket_;
|
|
|
| - SSLConfig ssl_config_;
|
| + SSLConfig server_ssl_config_;
|
| + SSLConfig proxy_ssl_config_;
|
|
|
| OldCompletionCallbackImpl<SocketStream> io_callback_;
|
| OldCompletionCallbackImpl<SocketStream> read_callback_;
|
|
|