summaryrefslogtreecommitdiffstats
path: root/net/socket_stream/socket_stream.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket_stream/socket_stream.h')
-rw-r--r--net/socket_stream/socket_stream.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index cf678d9..7f07196 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -99,7 +99,7 @@ class NET_EXPORT SocketStream
virtual void OnSSLCertificateError(SocketStream* socket,
const SSLInfo& ssl_info,
bool fatal) {
- socket->CancelBecauseOfCertError(ssl_info);
+ socket->CancelWithSSLError(ssl_info);
}
// Called when an error occured.
@@ -175,14 +175,17 @@ class NET_EXPORT SocketStream
// |factory|. For testing purposes only.
void SetClientSocketFactory(ClientSocketFactory* factory);
- // Cancel the connection because of receiving a certificate with an error.
+ // Cancels the connection because of an error.
// |error| is net::Error which represents the error.
- void CancelBecauseOfCertError(const SSLInfo& ssl_info);
+ void CancelWithError(int error);
- // Continue to establish the connection in spite of receiving a certificate
- // with an error. Usually this case happens because users allow it by manual
+ // Cancels the connection because of receiving a certificate with an error.
+ void CancelWithSSLError(const SSLInfo& ssl_info);
+
+ // Continues to establish the connection in spite of an error. Usually this
+ // case happens because users allow certificate with an error by manual
// actions on alert dialog or browser cached such kinds of user actions.
- void ContinueDespiteCertError();
+ void ContinueDespiteError();
protected:
friend class base::RefCountedThreadSafe<SocketStream>;