summaryrefslogtreecommitdiffstats
path: root/net/socket_stream/socket_stream.cc
diff options
context:
space:
mode:
authortoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 23:25:16 +0000
committertoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 23:25:16 +0000
commit734e5d88bfa0d11f6d6042766e6c0ea4361d6102 (patch)
tree07bdd479b8a26bd3fef11e43379da6bde5525c17 /net/socket_stream/socket_stream.cc
parenta9fbb096c17043dce4780bc5c77de24c78b5b596 (diff)
downloadchromium_src-734e5d88bfa0d11f6d6042766e6c0ea4361d6102.zip
chromium_src-734e5d88bfa0d11f6d6042766e6c0ea4361d6102.tar.gz
chromium_src-734e5d88bfa0d11f6d6042766e6c0ea4361d6102.tar.bz2
Use SSLManager to handle SSL error in SocketStreamDispatcherHost
- Provide render_process_id from RenderProcessHostImpl and WorkerProcessHost to SocketStreamDispatcherHost. - Provide render_view_id from SocketStreamHost to SocketStreamDispatcherHost. - Implement SSLErrorHandler::Delegate in SocketStreamDispatcherHost. - Then use SSLManager in SocketStreamDispatcherHost. BUG=53836 TEST=none Review URL: http://codereview.chromium.org/9704045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream.cc')
-rw-r--r--net/socket_stream/socket_stream.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 8604d28..8560733 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -255,14 +255,17 @@ void SocketStream::SetClientSocketFactory(
factory_ = factory;
}
-void SocketStream::CancelBecauseOfCertError(const SSLInfo& ssl_info) {
+void SocketStream::CancelWithError(int error) {
MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&SocketStream::DoLoop, this,
- MapCertStatusToNetError(ssl_info.cert_status)));
+ base::Bind(&SocketStream::DoLoop, this, error));
}
-void SocketStream::ContinueDespiteCertError() {
+void SocketStream::CancelWithSSLError(const SSLInfo& ssl_info) {
+ CancelWithError(MapCertStatusToNetError(ssl_info.cert_status));
+}
+
+void SocketStream::ContinueDespiteError() {
MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&SocketStream::DoLoop, this, OK));