Revert "Switch to BoringSSL."

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 3b384002f782de5accfadc8d29b1782a49274e3a..bda18453fc53c2d7c3be747f0db48470c270554b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -255,7 +255,7 @@
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
             ],
           },
           {  # else !use_openssl: remove the unneeded files
@@ -466,7 +466,7 @@
         }],
         [ 'OS == "android"', {
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
               'net_jni_headers',
             ],
             'sources!': [
@@ -475,6 +475,11 @@
               'cert/cert_verify_proc_openssl.cc',
               'cert/test_root_certs_openssl.cc',
             ],
+            # The net/android/keystore_openssl.cc source file needs to
+            # access an OpenSSL-internal header.
+            'include_dirs': [
+              '../third_party/openssl',
+            ],
           },
         ],
         [ 'use_icu_alternatives_on_android == 1', {
@@ -589,7 +594,7 @@
         [ 'use_openssl == 1', {
           # Avoid compiling/linking with the system library.
           'dependencies': [
-            '../third_party/boringssl/boringssl.gyp:boringssl',
+            '../third_party/openssl/openssl.gyp:openssl',
           ],
         }, {  # use_openssl == 0
           'conditions': [
@@ -792,7 +797,7 @@
         }],
         [ 'OS == "android"', {
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
@@ -974,7 +979,7 @@
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
-                '../third_party/boringssl/boringssl.gyp:boringssl',
+                '../third_party/openssl/openssl.gyp:openssl',
               ],
             }, {
               'dependencies': [
@@ -1377,7 +1382,7 @@
           ],
           'dependencies': [
             '../base/base.gyp:base',
-            '../third_party/boringssl/boringssl.gyp:boringssl',
+            '../third_party/openssl/openssl.gyp:openssl',
             'balsa',
             'epoll_server',
             'net',
@@ -1422,7 +1427,7 @@
           'dependencies': [
               '../testing/gtest.gyp:gtest',
               '../testing/gmock.gyp:gmock',
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
               'flip_in_mem_edsm_server_base',
               'net',
               'net_test_support',