| Index: net/socket/client_socket_factory.cc
|
| diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
|
| index f4da066fedadca763d81648a329e8ed1ff9488a1..dd201f97c160d43e46521b9dfb974703326cefdb 100644
|
| --- a/net/socket/client_socket_factory.cc
|
| +++ b/net/socket/client_socket_factory.cc
|
| @@ -79,17 +79,6 @@ static base::LazyInstance<DefaultClientSocketFactory>
|
|
|
| } // namespace
|
|
|
| -// static
|
| -ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
|
| - return g_default_client_socket_factory.Pointer();
|
| -}
|
| -
|
| -// static
|
| -void ClientSocketFactory::SetSSLClientSocketFactory(
|
| - SSLClientSocketFactory factory) {
|
| - g_ssl_factory = factory;
|
| -}
|
| -
|
| // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
|
| SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
|
| ClientSocket* transport_socket,
|
| @@ -104,4 +93,15 @@ SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
|
| NULL /* DnsCertProvenanceChecker */);
|
| }
|
|
|
| +// static
|
| +ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
|
| + return g_default_client_socket_factory.Pointer();
|
| +}
|
| +
|
| +// static
|
| +void ClientSocketFactory::SetSSLClientSocketFactory(
|
| + SSLClientSocketFactory factory) {
|
| + g_ssl_factory = factory;
|
| +}
|
| +
|
| } // namespace net
|
|
|