Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: webrtc/api/peerconnection_unittest.cc

Issue 2590153002: Revert of Add disabled certificate check support to IceServer PeerConnection API. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/peerconnection_unittest.cc
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index 4876b40bc844ff925c00de81cfb302b45894512c..b213ecb00f70effed4f3209958fb5ac8a0b3f412 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -40,7 +40,6 @@
#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/media/engine/fakewebrtcvideoengine.h"
#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/portinterface.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/p2p/base/testturnserver.h"
#include "webrtc/p2p/client/basicportallocator.h"
@@ -2620,21 +2619,11 @@
bool ParseUrl(const std::string& url,
const std::string& username,
const std::string& password) {
- return ParseUrl(
- url, username, password,
- PeerConnectionInterface::TlsCertPolicy::kTlsCertPolicySecure);
- }
-
- bool ParseUrl(const std::string& url,
- const std::string& username,
- const std::string& password,
- PeerConnectionInterface::TlsCertPolicy tls_certificate_policy) {
PeerConnectionInterface::IceServers servers;
PeerConnectionInterface::IceServer server;
server.urls.push_back(url);
server.username = username;
server.password = password;
- server.tls_cert_policy = tls_certificate_policy;
servers.push_back(server);
return webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_);
}
@@ -2665,18 +2654,6 @@
EXPECT_TRUE(ParseUrl("turns:hostname"));
EXPECT_EQ(0U, stun_servers_.size());
EXPECT_EQ(1U, turn_servers_.size());
- EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto);
- EXPECT_TRUE(turn_servers_[0].tls_cert_policy ==
- cricket::TlsCertPolicy::TLS_CERT_POLICY_SECURE);
- turn_servers_.clear();
-
- EXPECT_TRUE(ParseUrl(
- "turns:hostname", "", "",
- PeerConnectionInterface::TlsCertPolicy::kTlsCertPolicyInsecureNoCheck));
- EXPECT_EQ(0U, stun_servers_.size());
- EXPECT_EQ(1U, turn_servers_.size());
- EXPECT_TRUE(turn_servers_[0].tls_cert_policy ==
- cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK);
EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto);
turn_servers_.clear();
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698