summaryrefslogtreecommitdiffstats
path: root/jingle/notifier/base
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 23:18:11 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 23:18:11 +0000
commit9f59fac37e0af9a1e8a840fa18b6c1c69f221cdf (patch)
tree6ac47bc52e32f5a1b9a7917582e993116c0bcf17 /jingle/notifier/base
parent48f67668c7362e2532636fe241a3f631a0c9945c (diff)
downloadchromium_src-9f59fac37e0af9a1e8a840fa18b6c1c69f221cdf.zip
chromium_src-9f59fac37e0af9a1e8a840fa18b6c1c69f221cdf.tar.gz
chromium_src-9f59fac37e0af9a1e8a840fa18b6c1c69f221cdf.tar.bz2
Make CertVerifier a pure virtual interface.
The existing CertVerifier implementation has been renamed to MultiThreadedCertVerifier, consistent with ProxyResolver naming. This is patch 1 of N for http://crbug.com/114343 BUG=114343 TEST=Compiles and existing unittests pass. Review URL: https://chromiumcodereview.appspot.com/9476035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/base')
-rw-r--r--jingle/notifier/base/chrome_async_socket_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
index 9b1d07a..08dbf301 100644
--- a/jingle/notifier/base/chrome_async_socket_unittest.cc
+++ b/jingle/notifier/base/chrome_async_socket_unittest.cc
@@ -120,7 +120,8 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
net::ClientSocketFactory* mock_client_socket_factory,
const net::AddressList& address_list)
: mock_client_socket_factory_(mock_client_socket_factory),
- address_list_(address_list) {
+ address_list_(address_list),
+ cert_verifier_(net::CertVerifier::CreateDefault()) {
}
// ResolvingClientSocketFactory implementation.
@@ -134,7 +135,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
net::ClientSocketHandle* transport_socket,
const net::HostPortPair& host_and_port) {
net::SSLClientSocketContext context;
- context.cert_verifier = &cert_verifier_;
+ context.cert_verifier = cert_verifier_.get();
return mock_client_socket_factory_->CreateSSLClientSocket(
transport_socket, host_and_port, ssl_config_, NULL, context);
}
@@ -143,7 +144,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
scoped_ptr<net::ClientSocketFactory> mock_client_socket_factory_;
net::AddressList address_list_;
net::SSLConfig ssl_config_;
- net::CertVerifier cert_verifier_;
+ scoped_ptr<net::CertVerifier> cert_verifier_;
};
class ChromeAsyncSocketTest