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/remoting.gyp | |
| 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/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index b0c52e2..71b81d0 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -316,12 +316,6 @@ 'jingle_glue/jingle_thread.h', 'jingle_glue/relay_port_allocator.cc', 'jingle_glue/relay_port_allocator.h', - 'jingle_glue/ssl_adapter.h', - 'jingle_glue/ssl_adapter.cc', - 'jingle_glue/ssl_socket_adapter.cc', - 'jingle_glue/ssl_socket_adapter.h', - 'jingle_glue/xmpp_socket_adapter.cc', - 'jingle_glue/xmpp_socket_adapter.h', ], }, # end of target 'chromoting_jingle_glue' |