diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 20:07:30 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 20:07:30 +0000 |
| commit | c78aebb5b07c7e1c6f50b2c460658b8202306fbf (patch) | |
| tree | 1893d676be04efa1b1e937d75836734d00ed5bc5 /remoting | |
| parent | 98502701aa5d4793f3c8240554d6499743c5b189 (diff) | |
| download | chromium_src-c78aebb5b07c7e1c6f50b2c460658b8202306fbf.zip chromium_src-c78aebb5b07c7e1c6f50b2c460658b8202306fbf.tar.gz chromium_src-c78aebb5b07c7e1c6f50b2c460658b8202306fbf.tar.bz2 | |
Use NSS for SSL encryption of XMPP connection on Windows.
Review URL: http://codereview.chromium.org/10169012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/jingle_glue/ssl_adapter.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/remoting/jingle_glue/ssl_adapter.cc b/remoting/jingle_glue/ssl_adapter.cc index 25cd75a..5d84822 100644 --- a/remoting/jingle_glue/ssl_adapter.cc +++ b/remoting/jingle_glue/ssl_adapter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,11 +14,7 @@ namespace remoting { talk_base::SSLAdapter* CreateSSLAdapter(talk_base::AsyncSocket* socket) { talk_base::SSLAdapter* ssl_adapter = -#if defined(OS_WIN) - talk_base::SSLAdapter::Create(socket); -#else remoting::SSLSocketAdapter::Create(socket); -#endif DCHECK(ssl_adapter); return ssl_adapter; } |