Partially merge r177090 for crbug.com/169131.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp	(revision 177240)
+++ third_party/libjingle/libjingle.gyp	(working copy)
@@ -148,6 +148,8 @@
         ],
       }, {
         'defines': [
+          'SSL_USE_NSS',
+          'HAVE_NSS_SSL_H',
           'SSL_USE_NSS_RNG',
         ],
         'conditions': [
@@ -159,6 +161,7 @@
           }],
           ['OS == "mac" or OS == "ios" or OS == "win"', {
             'dependencies': [
+              '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
               '<(DEPTH)/third_party/nss/nss.gyp:nspr',
               '<(DEPTH)/third_party/nss/nss.gyp:nss',
             ],
@@ -326,6 +329,8 @@
         '<(libjingle_source)/talk/base/socketstream.h',
         '<(libjingle_source)/talk/base/ssladapter.cc',
         '<(libjingle_source)/talk/base/ssladapter.h',
+        '<(libjingle_source)/talk/base/sslidentity.cc',
+        '<(libjingle_source)/talk/base/sslidentity.h',
         '<(libjingle_source)/talk/base/sslsocketfactory.cc',
         '<(libjingle_source)/talk/base/sslsocketfactory.h',
         '<(libjingle_source)/talk/base/sslstreamadapter.cc',