Merge third_party/webrtc from https://chromium.googlesource.com/a/external/webrtc/stable/webrtc.git at 102e8974ff5b0bea642178e580076bf541841f9a

This commit was generated by merge_from_chromium.py.

Change-Id: Icb4e2ba2c733a7abd5b78be9be303d7742696695

3 files changed, 66 insertions, 118 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index fbed1a52..0de5ea46 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -30,7 +30,6 @@ config("webrtc_base_config") {
 config("webrtc_base_chromium_config") {
   defines = [
     "NO_MAIN_THREAD_WRAPPING",
-    "SSL_USE_NSS",
   ]
 }
 
@@ -49,17 +48,6 @@ config("no_openssl_config") {
   ]
 }
 
-config("android_config") {
-  defines = [ "HAVE_OPENSSL_SSL_H" ]
-}
-
-config("no_android_config") {
-  defines = [
-    "HAVE_NSS_SSL_H",
-    "SSL_USE_NSS_RNG",
-  ]
-}
-
 config("ios_config") {
   ldflags = [
     #"Foundation.framework",  # Already included in //build/config:default_libs.
@@ -221,10 +209,6 @@ static_library("webrtc_base") {
     "nethelpers.h",
     "network.cc",
     "network.h",
-    "nssidentity.cc",
-    "nssidentity.h",
-    "nssstreamadapter.cc",
-    "nssstreamadapter.h",
     "nullsocketserver.h",
     "pathutils.cc",
     "pathutils.h",
@@ -359,7 +343,6 @@ static_library("webrtc_base") {
       "natsocketfactory.h",
       "nattypes.cc",
       "nattypes.h",
-      "openssl.h",
       "optionsfile.cc",
       "optionsfile.h",
       "profiler.cc",
@@ -468,8 +451,36 @@ static_library("webrtc_base") {
     } else {
       configs += [ "external_ssl_library" ]
     }
+    sources += [
+      "openssl.h",
+      "openssladapter.cc",
+      "openssladapter.h",
+      "openssldigest.cc",
+      "openssldigest.h",
+      "opensslidentity.cc",
+      "opensslidentity.h",
+      "opensslstreamadapter.cc",
+      "opensslstreamadapter.h",
+    ]
   } else {
     direct_dependent_configs += [ ":no_openssl_config" ]
+    sources += [
+      "nssidentity.cc",
+      "nssidentity.h",
+      "nssstreamadapter.cc",
+      "nssstreamadapter.h",
+    ]
+    if (is_mac || is_ios || is_win) {
+      if (rtc_build_ssl) {
+        deps += [
+          "//net/third_party/nss/ssl:libssl",
+          "//third_party/nss:nspr",
+          "//third_party/nss:nss",
+        ]
+      } else {
+        configs += [ "external_ssl_library" ]
+      }
+    }
   }
 
   if (is_android) {
@@ -478,24 +489,14 @@ static_library("webrtc_base") {
       "ifaddrs-android.h",
     ]
 
-    direct_dependent_configs += [ ":android_config" ]
-
     libs += [
       "log",
       "GLESv2"
     ]
-  } else {
-    direct_dependent_configs += [ ":no_android_config" ]
   }
 
   if (is_ios) {
     all_dependent_configs += [ ":ios_config" ]
-
-    if (rtc_build_ssl) {
-      deps += [ "//net/third_party/nss/ssl:libssl" ]
-    } else {
-      configs += [ "external_ssl_library" ]
-    }
   }
 
   if (use_x11) {
@@ -536,10 +537,6 @@ static_library("webrtc_base") {
 
     all_dependent_configs = [ ":mac_config" ]
 
-    libs += [
-      "crypto",  # $(SDKROOT)/usr/lib/libcrypto.dylib
-      "ssl",  # $(SDKROOT)/usr/lib/libssl.dylib
-    ]
     if (cpu_arch == "x86") {
       all_dependent_configs += [ ":mac_x86_config" ]
     }
@@ -590,20 +587,6 @@ static_library("webrtc_base") {
     defines += [ "CARBON_DEPRECATED=YES" ]
   }
 
-  if (!is_ios) {
-    sources += [
-      "openssl.h",
-      "openssladapter.cc",
-      "openssladapter.h",
-      "openssldigest.cc",
-      "openssldigest.h",
-      "opensslidentity.cc",
-      "opensslidentity.h",
-      "opensslstreamadapter.cc",
-      "opensslstreamadapter.h",
-    ]
-  }
-
   if (is_linux || is_android) {
     sources += [
       "linux.cc",
@@ -611,18 +594,6 @@ static_library("webrtc_base") {
     ]
   }
 
-  if (is_mac || is_ios || is_win) {
-    if (rtc_build_ssl) {
-      deps += [
-        "//net/third_party/nss/ssl:libssl",
-        "//third_party/nss:nspr",
-        "//third_party/nss:nss",
-      ]
-    } else {
-      configs += [ "external_ssl_library" ]
-    }
-  }
-
   if (is_posix && !is_mac && !is_ios && !is_android) {
     if (build_with_chromium) {
       deps += [ "//crypto:platform" ]
diff --git a/base/base.gyp b/base/base.gyp
index fa92707c..07f4c0ba 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -192,20 +192,7 @@
         'nethelpers.h',
         'network.cc',
         'network.h',
-        'nssidentity.cc',
-        'nssidentity.h',
-        'nssstreamadapter.cc',
-        'nssstreamadapter.h',
         'nullsocketserver.h',
-        'openssl.h',
-        'openssladapter.cc',
-        'openssladapter.h',
-        'openssldigest.cc',
-        'openssldigest.h',
-        'opensslidentity.cc',
-        'opensslidentity.h',
-        'opensslstreamadapter.cc',
-        'opensslstreamadapter.h',
         'optionsfile.cc',
         'optionsfile.h',
         'pathutils.cc',
@@ -421,7 +408,6 @@
             'natsocketfactory.h',
             'nattypes.cc',
             'nattypes.h',
-            'openssl.h',
             'optionsfile.cc',
             'optionsfile.h',
             'posix.cc',
@@ -464,12 +450,10 @@
           ],
           'defines': [
             'NO_MAIN_THREAD_WRAPPING',
-            'SSL_USE_NSS',
           ],
           'direct_dependent_settings': {
             'defines': [
               'NO_MAIN_THREAD_WRAPPING',
-              'SSL_USE_NSS',
             ],
           },
         }, {
@@ -509,6 +493,17 @@
               'HAVE_OPENSSL_SSL_H',
             ],
           },
+          'sources': [
+            'openssl.h',
+            'openssladapter.cc',
+            'openssladapter.h',
+            'openssldigest.cc',
+            'openssldigest.h',
+            'opensslidentity.cc',
+            'opensslidentity.h',
+            'opensslstreamadapter.cc',
+            'opensslstreamadapter.h',
+          ],
           'conditions': [
             ['build_ssl==1', {
               'dependencies': [
@@ -521,6 +516,12 @@
             }],
           ],
         }, {
+          'sources': [
+            'nssidentity.cc',
+            'nssidentity.h',
+            'nssstreamadapter.cc',
+            'nssstreamadapter.h',
+          ],
           'conditions': [
             ['use_legacy_ssl_defaults!=1', {
               'defines': [
@@ -536,6 +537,21 @@
                 ],
               },
             }],
+            ['OS=="mac" or OS=="ios" or OS=="win"', {
+              'conditions': [
+                ['build_ssl==1', {
+                  'dependencies': [
+                    '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
+                    '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+                    '<(DEPTH)/third_party/nss/nss.gyp:nss',
+                  ],
+                }, {
+                  'include_dirs': [
+                    '<(ssl_root)',
+                  ],
+                }],
+              ],
+            }],
           ],
         }],
         ['OS == "android"', {
@@ -584,17 +600,6 @@
               ],
             },
           },
-           'conditions': [
-            ['build_ssl==1', {
-              'dependencies': [
-                '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
-              ]
-            }, {
-              'include_dirs': [
-                '<(ssl_root)',
-              ],
-            }],
-          ],
         }],
         ['use_x11 == 1', {
           'link_settings': {
@@ -645,12 +650,6 @@
           ],
         }],
         ['OS=="mac"', {
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/usr/lib/libcrypto.dylib',
-              '$(SDKROOT)/usr/lib/libssl.dylib',
-            ],
-          },
           'all_dependent_settings': {
             'link_settings': {
               'xcode_settings': {
@@ -750,40 +749,12 @@
             'scoped_autorelease_pool.mm',
           ],
         }],
-        ['OS=="ios"', {
-          'sources!': [
-            'openssl.h',
-            'openssladapter.cc',
-            'openssladapter.h',
-            'openssldigest.cc',
-            'openssldigest.h',
-            'opensslidentity.cc',
-            'opensslidentity.h',
-            'opensslstreamadapter.cc',
-            'opensslstreamadapter.h',
-          ],
-        }],
         ['OS!="linux" and OS!="android"', {
           'sources!': [
             'linux.cc',
             'linux.h',
           ],
         }],
-        ['OS == "mac" or OS == "ios" or OS == "win"', {
-          'conditions': [
-            ['build_ssl==1', {
-              'dependencies': [
-                '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
-                '<(DEPTH)/third_party/nss/nss.gyp:nspr',
-                '<(DEPTH)/third_party/nss/nss.gyp:nss',
-              ],
-            }, {
-              'include_dirs': [
-                '<(ssl_root)',
-              ],
-            }],
-          ],
-        }],
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'conditions': [
             ['build_ssl==1', {
diff --git a/base/opensslstreamadapter.cc b/base/opensslstreamadapter.cc
index 070a948b..133eb72b 100644
--- a/base/opensslstreamadapter.cc
+++ b/base/opensslstreamadapter.cc
@@ -695,6 +695,12 @@ void OpenSSLStreamAdapter::Cleanup() {
   }
 
   if (ssl_) {
+    int ret = SSL_shutdown(ssl_);
+    if (ret < 0) {
+      LOG(LS_WARNING) << "SSL_shutdown failed, error = "
+                      << SSL_get_error(ssl_, ret);
+    }
+
     SSL_free(ssl_);
     ssl_ = NULL;
   }