diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 16:53:42 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 16:53:42 +0000 |
| commit | ba62fbd428232eee1815d4b4d63fc65cb3ead566 (patch) | |
| tree | 56d05f663fe81afc7c7f6c232d1f650994bbe8ed /remoting/jingle_glue/ssl_adapter.cc | |
| parent | a538b1cdbd69c307ef672b5176c8ac9039981c41 (diff) | |
| download | chromium_src-ba62fbd428232eee1815d4b4d63fc65cb3ead566.zip chromium_src-ba62fbd428232eee1815d4b4d63fc65cb3ead566.tar.gz chromium_src-ba62fbd428232eee1815d4b4d63fc65cb3ead566.tar.bz2 | |
Revert r59012 which started using Chrome sockets for sync.
This caused us to write to ChromeNetLog from the sync thread. ChromeNetLog is not thread safe, so this causes problems.
BUG=55116,54146
TEST=Start up chrome. Does not repeatedly hit DCHECKs on ChromeNetLog::AddEntry().
Review URL: http://codereview.chromium.org/3358028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue/ssl_adapter.cc')
| -rw-r--r-- | remoting/jingle_glue/ssl_adapter.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/remoting/jingle_glue/ssl_adapter.cc b/remoting/jingle_glue/ssl_adapter.cc deleted file mode 100644 index 68d350c..0000000 --- a/remoting/jingle_glue/ssl_adapter.cc +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2009 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. - -#include "remoting/jingle_glue/ssl_adapter.h" - -#if defined(OS_WIN) -#include "talk/base/ssladapter.h" -#else -#include "remoting/jingle_glue/ssl_socket_adapter.h" -#endif - -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; -} - -} // namespace remoting - |