Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL.

Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16224}
Committed: https://chromium.googlesource.com/external/webrtc/+/1b54a5f01844e30ed87767ce990325c1a5a026ce

[Taylor Brandstetter, 2017-01-17 18:41:17]

The CQ bit was checked by deadbeef@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-17 18:41:20]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Taylor Brandstetter, 2017-01-17 18:43:46]

deadbeef@webrtc.org changed reviewers:
+ pthatcher@webrtc.org

[Taylor Brandstetter, 2017-01-17 18:43:46]

PTAL Peter. Is my assumption (that we don't intend to support building without
SSL support) valid?

[Taylor Brandstetter, 2017-01-17 18:43:56]

Description was changed from

==========
Removing support for building without OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=None
==========

to

==========
Removing support for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=None
==========

[commit-bot: I haz the power, 2017-01-17 19:53:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-17 19:53:20]

Dry run: This issue passed the CQ dry run.

[pthatcher1, 2017-01-19 21:09:14]

lgtm

I think this deserves another set of eyes, perhaps by tommi@ or kjellander.

[Taylor Brandstetter, 2017-01-19 23:17:53]

deadbeef@webrtc.org changed reviewers:
+ kjellander@webrtc.org
- pthatcher@webrtc.org

[Taylor Brandstetter, 2017-01-19 23:17:54]

kjellander: Can you take a look when back from vacation? Thanks.

[kjellander_webrtc, 2017-01-20 07:33:52]

lgtm with my question answered and a BUG= referenced. 
I'm wondering if an announcement should be sent out to discuss-webrtc@ as well
when landing this.

https://codereview.webrtc.org/2640513002/diff/1/webrtc/BUILD.gn
File webrtc/BUILD.gn (left):

https://codereview.webrtc.org/2640513002/diff/1/webrtc/BUILD.gn#oldcode135
webrtc/BUILD.gn:135: "HAVE_OPENSSL_SSL_H",
This define is still mentioned in
https://cs.chromium.org/chromium/src/third_party/usrsctp/localchanges.patch but
I don't see the output of that patch living anywhere. Should we clean it up?

https://codereview.webrtc.org/2640513002/diff/1/webrtc/BUILD.gn#oldcode140
webrtc/BUILD.gn:140: "SSL_USE_OPENSSL",
Same as for HAVE_OPENSSL_SSL_H above.

[Taylor Brandstetter, 2017-01-20 18:26:15]

I doubt anyone on discuss-webrtc is using these defines; it would take a
nontrivial of hacking to make them work. And even then, libsrtp depends on
boringssl.

https://codereview.webrtc.org/2640513002/diff/1/webrtc/BUILD.gn
File webrtc/BUILD.gn (left):

https://codereview.webrtc.org/2640513002/diff/1/webrtc/BUILD.gn#oldcode135
webrtc/BUILD.gn:135: "HAVE_OPENSSL_SSL_H",
On 2017/01/20 07:33:52, kjellander_webrtc wrote:
> This define is still mentioned in
> https://cs.chromium.org/chromium/src/third_party/usrsctp/localchanges.patch
but
> I don't see the output of that patch living anywhere. Should we clean it up?

It looks like localchanges.patch is dead, and just wasn't removed by
https://chromiumcodereview.appspot.com/23960004. I'll remove it.

[Taylor Brandstetter, 2017-01-20 18:29:58]

Description was changed from

==========
Removing support for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=None
==========

to

==========
Removing support for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

[Taylor Brandstetter, 2017-01-20 18:30:25]

Description was changed from

==========
Removing support for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

to

==========
Removing #defines previously used for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

[Taylor Brandstetter, 2017-01-20 19:45:26]

The CQ bit was checked by deadbeef@webrtc.org

[commit-bot: I haz the power, 2017-01-20 19:45:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-20 21:01:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-20 21:01:24]

Failed to apply patch for webrtc/pc/channel_unittest.cc:
While running git apply --index -p1;
  error: patch failed: webrtc/pc/channel_unittest.cc:24
  error: webrtc/pc/channel_unittest.cc: patch does not apply

Patch:       webrtc/pc/channel_unittest.cc
Index: webrtc/pc/channel_unittest.cc
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index
3970588e833ee47172e9b6fff1c2c16f682cbe2e..7d3dce84543afe9d34de9ca9d9d63b3bf2afc03f
100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -24,12 +24,6 @@
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/pc/channel.h"
 
-#define MAYBE_SKIP_TEST(feature)                    \
-  if (!(rtc::SSLStreamAdapter::feature())) {  \
-    LOG(LS_INFO) << "Feature disabled... skipping"; \
-    return;                                         \
-  }
-
 using cricket::CA_OFFER;
 using cricket::CA_PRANSWER;
 using cricket::CA_ANSWER;
@@ -2238,32 +2232,26 @@ TEST_F(VoiceChannelSingleThreadTest, SendSrtcpMux) {
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, 0);
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS);
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtpGcmBoth) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | GCM_CIPHER, DTLS | GCM_CIPHER);
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtpGcmOne) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | GCM_CIPHER, DTLS);
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtpGcmTwo) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS | GCM_CIPHER);
 }
 
 TEST_F(VoiceChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtpRtcpMux) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | RTCP_MUX, DTLS | RTCP_MUX);
 }
 
@@ -2571,32 +2559,26 @@ TEST_F(VoiceChannelDoubleThreadTest, SendSrtcpMux) {
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, 0);
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS);
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtpGcmBoth) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | GCM_CIPHER, DTLS | GCM_CIPHER);
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtpGcmOne) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | GCM_CIPHER, DTLS);
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtpGcmTwo) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS | GCM_CIPHER);
 }
 
 TEST_F(VoiceChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtpRtcpMux) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | RTCP_MUX, DTLS | RTCP_MUX);
 }
 
@@ -2896,17 +2878,14 @@ TEST_F(VideoChannelSingleThreadTest, SendSrtpToRtp) {
 }
 
 TEST_F(VideoChannelSingleThreadTest, SendDtlsSrtpToSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, 0);
 }
 
 TEST_F(VideoChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS);
 }
 
 TEST_F(VideoChannelSingleThreadTest, SendDtlsSrtpToDtlsSrtpRtcpMux) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | RTCP_MUX, DTLS | RTCP_MUX);
 }
 
@@ -3128,17 +3107,14 @@ TEST_F(VideoChannelDoubleThreadTest, SendSrtpToRtp) {
 }
 
 TEST_F(VideoChannelDoubleThreadTest, SendDtlsSrtpToSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, 0);
 }
 
 TEST_F(VideoChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtp) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS, DTLS);
 }
 
 TEST_F(VideoChannelDoubleThreadTest, SendDtlsSrtpToDtlsSrtpRtcpMux) {
-  MAYBE_SKIP_TEST(HaveDtlsSrtp);
   Base::SendSrtpToSrtp(DTLS | RTCP_MUX, DTLS | RTCP_MUX);
 }

[Taylor Brandstetter, 2017-01-20 22:21:55]

The CQ bit was checked by deadbeef@webrtc.org

[Taylor Brandstetter, 2017-01-20 22:21:55]

The patchset sent to the CQ was uploaded after l-g-t-m from
kjellander@webrtc.org, pthatcher@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2640513002/#ps20001 (title:
"Rebasing.")

[commit-bot: I haz the power, 2017-01-20 22:22:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-20 23:15:59]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1484950915198690,
"parent_rev": "cd3180c0c6a8cdbd1718dc6b2fba49ba06bb2cdd", "commit_rev":
"eaa826c2ee0668cfb4a0dfb66f8d388b65da20f5"}

[commit-bot: I haz the power, 2017-01-20 23:16:03]

Description was changed from

==========
Removing #defines previously used for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

to

==========
Removing #defines previously used for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025

Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16196}
Committed:
https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66...
==========

[commit-bot: I haz the power, 2017-01-20 23:16:04]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66...

[Taylor Brandstetter, 2017-01-21 01:01:32]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.webrtc.org/2648003003/ by deadbeef@webrtc.org.

The reason for reverting is: Broke chromium build, due to a config being
removed. Will add it back and remove the dependency in a chromium CL..

[Taylor Brandstetter, 2017-01-21 01:02:08]

Description was changed from

==========
Removing #defines previously used for building without BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025

Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16196}
Committed:
https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66...
==========

to

==========
Relanding: Removing #defines previously used for building without
BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025

Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16196}
Committed:
https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66...
==========

[Taylor Brandstetter, 2017-01-21 01:03:49]

On 2017/01/21 01:01:32, Taylor Brandstetter wrote:
> A revert of this CL (patchset #2 id:20001) has been created in
> https://codereview.webrtc.org/2648003003/ by mailto:deadbeef@webrtc.org.
> 
> The reason for reverting is: Broke chromium build, due to a config being
> removed. Will add it back and remove the dependency in a chromium CL..

Oh, actually it's simpler than that. Just need to initialize "public_configs"
higher up in webrtc/base/BUILD.gn

[Taylor Brandstetter, 2017-01-21 01:06:57]

The CQ bit was checked by deadbeef@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-21 01:07:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-21 01:57:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-21 01:57:22]

Dry run: This issue passed the CQ dry run.

[Taylor Brandstetter, 2017-01-24 02:29:19]

Description was changed from

==========
Relanding: Removing #defines previously used for building without
BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025

Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16196}
Committed:
https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66...
==========

to

==========
Relanding: Removing #defines previously used for building without
BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

[Taylor Brandstetter, 2017-01-24 02:30:40]

The CQ bit was checked by deadbeef@webrtc.org

[Taylor Brandstetter, 2017-01-24 02:30:41]

The patchset sent to the CQ was uploaded after l-g-t-m from
kjellander@webrtc.org, pthatcher@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2640513002/#ps60001 (title:
"Rebase")

[commit-bot: I haz the power, 2017-01-24 02:30:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-24 03:39:59]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1485225040705050,
"parent_rev": "4c78702d12dce984a0616f5c91f0696a71da3fcf", "commit_rev":
"1b54a5f01844e30ed87767ce990325c1a5a026ce"}

[commit-bot: I haz the power, 2017-01-24 03:40:02]

Description was changed from

==========
Relanding: Removing #defines previously used for building without
BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025
==========

to

==========
Relanding: Removing #defines previously used for building without
BoringSSL/OpenSSL.

These defines don't work any more, so they only cause confusion:

FEATURE_ENABLE_SSL
HAVE_OPENSSL_SSL_H
SSL_USE_OPENSSL

BUG=webrtc:7025

Review-Url: https://codereview.webrtc.org/2640513002
Cr-Commit-Position: refs/heads/master@{#16224}
Committed:
https://chromium.googlesource.com/external/webrtc/+/1b54a5f01844e30ed87767ce9...
==========

[commit-bot: I haz the power, 2017-01-24 03:40:04]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/external/webrtc/+/1b54a5f01844e30ed87767ce9...