diff options
| -rw-r--r-- | crypto/openssl_util.cc | 6 | ||||
| -rw-r--r-- | net/socket/ssl_server_socket_openssl.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc index feb47ca..bdf24e6 100644 --- a/crypto/openssl_util.cc +++ b/crypto/openssl_util.cc @@ -34,8 +34,8 @@ class OpenSSLInitSingleton { // we can't control the order the AtExit handlers will run in so // allowing the global environment to leak at least ensures it is // available for those other singletons to reliably cleanup. - return base::Singleton<OpenSSLInitSingleton, - base::LeakySingletonTraits<OpenSSLInitSingleton> >::get(); + return Singleton<OpenSSLInitSingleton, + LeakySingletonTraits<OpenSSLInitSingleton> >::get(); } private: friend struct DefaultSingletonTraits<OpenSSLInitSingleton>; @@ -85,7 +85,7 @@ class OpenSSLInitSingleton { // error queue and return, otherwise it will continue calling this function // until all errors have been removed from the queue. int OpenSSLErrorCallback(const char* str, size_t len, void* context) { - DVLOG(1) << "\t" << StringPiece(str, len); + DVLOG(1) << "\t" << base::StringPiece(str, len); return 1; } diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc index 0928bbb..68c26fe 100644 --- a/net/socket/ssl_server_socket_openssl.cc +++ b/net/socket/ssl_server_socket_openssl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -51,7 +51,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket { SSLServerSocket* CreateSSLServerSocket(Socket* socket, X509Certificate* certificate, - base::RSAPrivateKey* key, + crypto::RSAPrivateKey* key, const SSLConfig& ssl_config) { return new SSLServerSocketOpenSSL(); } |