summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 01:20:05 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 01:20:05 +0000
commitba89742ced6463b6d555b8caf3806ad45d48e39b (patch)
treecc251f846f127e93264f92e69914d79a34e867af /chrome/chrome.gyp
parentf3a30a9cd0456fdc6c4969dfc7e42b82f98c117b (diff)
downloadchromium_src-ba89742ced6463b6d555b8caf3806ad45d48e39b.zip
chromium_src-ba89742ced6463b6d555b8caf3806ad45d48e39b.tar.gz
chromium_src-ba89742ced6463b6d555b8caf3806ad45d48e39b.tar.bz2
Use the right SSL adapter on Linux/OS X. This is a partial fix for the crash in 30721.
Added method for creating ssl socket adapters to libjingle socket factories and made callers use it. Added SSLSocketAdapterFactory class, which uses the right SSL socket adapter for Linux/OS X. Fixed bug in asynchttprequest.cc where ignore_bad_cert_ was being left uninitialized. BUG=30721 TEST=trybots, manual testing Review URL: http://codereview.chromium.org/503087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 903c39c..c010272 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -621,6 +621,8 @@
'browser/sync/notifier/base/network_status_detector_task_mt.h',
'browser/sync/notifier/base/posix/time_posix.cc',
'browser/sync/notifier/base/signal_thread_task.h',
+ 'browser/sync/notifier/base/ssl_adapter.h',
+ 'browser/sync/notifier/base/ssl_adapter.cc',
'browser/sync/notifier/base/static_assert.h',
'browser/sync/notifier/base/task_pump.cc',
'browser/sync/notifier/base/task_pump.h',