summaryrefslogtreecommitdiffstats
path: root/jingle/notifier/base/chrome_async_socket_unittest.cc
diff options
context:
space:
mode:
authorwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 16:06:06 +0000
committerwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 16:06:06 +0000
commit8a9b4596ed3fd75411fb4a26c8e2c2f0a63a0d0a (patch)
tree28b7d79c28809661f8d8b38a082ad019e6fd39b7 /jingle/notifier/base/chrome_async_socket_unittest.cc
parent8855583c5785c972d557a800684da81a1dcb6646 (diff)
downloadchromium_src-8a9b4596ed3fd75411fb4a26c8e2c2f0a63a0d0a.zip
chromium_src-8a9b4596ed3fd75411fb4a26c8e2c2f0a63a0d0a.tar.gz
chromium_src-8a9b4596ed3fd75411fb4a26c8e2c2f0a63a0d0a.tar.bz2
The MediatorThread worker thread needs to have a CertVerifier
for the SSLClientSocket objects it creates. R=agl,akalin BUG=63357,67239 TEST=Sync should not crash. Review URL: http://codereview.chromium.org/5958001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/base/chrome_async_socket_unittest.cc')
-rw-r--r--jingle/notifier/base/chrome_async_socket_unittest.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
index b6a3e26..842f8cb 100644
--- a/jingle/notifier/base/chrome_async_socket_unittest.cc
+++ b/jingle/notifier/base/chrome_async_socket_unittest.cc
@@ -11,9 +11,10 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/scoped_ptr.h"
-#include "net/base/ssl_config_service.h"
#include "net/base/capturing_net_log.h"
+#include "net/base/cert_verifier.h"
#include "net/base/net_errors.h"
+#include "net/base/ssl_config_service.h"
#include "net/socket/socket_test_util.h"
#include "talk/base/sigslot.h"
#include "talk/base/socketaddress.h"
@@ -115,7 +116,8 @@ class ChromeAsyncSocketTest
chrome_async_socket_.reset(
new ChromeAsyncSocket(mock_client_socket_factory.release(),
- ssl_config_, 14, 20, &capturing_net_log_)),
+ ssl_config_, &cert_verifier_, 14, 20,
+ &capturing_net_log_)),
chrome_async_socket_->SignalConnected.connect(
this, &ChromeAsyncSocketTest::OnConnect);
@@ -371,6 +373,7 @@ class ChromeAsyncSocketTest
net::CapturingNetLog capturing_net_log_;
net::SSLConfig ssl_config_;
+ net::CertVerifier cert_verifier_;
scoped_ptr<ChromeAsyncSocket> chrome_async_socket_;
std::deque<SignalSocketState> signal_socket_states_;
const talk_base::SocketAddress addr_;