Revert of Add disabled certificate check support to IceServer PeerConnection API.

webrtc/sdk/android/src/jni/peerconnection_jni.cc

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1548 matching lines @@
     return PeerConnectionInterface::GATHER_ONCE;
 
   if (enum_name == "GATHER_CONTINUALLY")
     return PeerConnectionInterface::GATHER_CONTINUALLY;
 
   RTC_CHECK(false) << "Unexpected ContinualGatheringPolicy enum name "
                    << enum_name;
   return PeerConnectionInterface::GATHER_ONCE;
 }
 
-static PeerConnectionInterface::TlsCertPolicy JavaTlsCertPolicyTypeToNativeType(
-    JNIEnv* jni,
-    jobject j_ice_server_tls_cert_policy) {
-  std::string enum_name =
-      GetJavaEnumName(jni, "org/webrtc/PeerConnection$TlsCertPolicy",
-                      j_ice_server_tls_cert_policy);
-
-  if (enum_name == "TLS_CERT_POLICY_SECURE")
-    return PeerConnectionInterface::kTlsCertPolicySecure;
-
-  if (enum_name == "TLS_CERT_POLICY_INSECURE_NO_CHECK")
-    return PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck;
-
-  RTC_CHECK(false) << "Unexpected TlsCertPolicy enum_name " << enum_name;
-  return PeerConnectionInterface::kTlsCertPolicySecure;
-}
-
 static void JavaIceServersToJsepIceServers(
     JNIEnv* jni, jobject j_ice_servers,
     PeerConnectionInterface::IceServers* ice_servers) {
   for (jobject j_ice_server : Iterable(jni, j_ice_servers)) {
     jclass j_ice_server_class = GetObjectClass(jni, j_ice_server);
     jfieldID j_ice_server_uri_id =
         GetFieldID(jni, j_ice_server_class, "uri", "Ljava/lang/String;");
     jfieldID j_ice_server_username_id =
         GetFieldID(jni, j_ice_server_class, "username", "Ljava/lang/String;");
     jfieldID j_ice_server_password_id =
         GetFieldID(jni, j_ice_server_class, "password", "Ljava/lang/String;");
-    jfieldID j_ice_server_tls_cert_policy_id =
-        GetFieldID(jni, j_ice_server_class, "tlsCertPolicy",
-                   "Lorg/webrtc/PeerConnection$TlsCertPolicy;");
-    jobject j_ice_server_tls_cert_policy =
-        GetObjectField(jni, j_ice_server, j_ice_server_tls_cert_policy_id);
     jstring uri = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_uri_id));
     jstring username = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_username_id));
     jstring password = reinterpret_cast<jstring>(
         GetObjectField(jni, j_ice_server, j_ice_server_password_id));
-    PeerConnectionInterface::TlsCertPolicy tls_cert_policy =
-        JavaTlsCertPolicyTypeToNativeType(jni, j_ice_server_tls_cert_policy);
     PeerConnectionInterface::IceServer server;
     server.uri = JavaToStdString(jni, uri);
     server.username = JavaToStdString(jni, username);
     server.password = JavaToStdString(jni, password);
-    server.tls_cert_policy = tls_cert_policy;
     ice_servers->push_back(server);
   }
 }
 
 static void JavaRTCConfigurationToJsepRTCConfiguration(
     JNIEnv* jni,
     jobject j_rtc_config,
     PeerConnectionInterface::RTCConfiguration* rtc_config) {
   jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config);
 
@@ skipping 867 matching lines @@
   reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
       ->SetObserver(nullptr);
   RtpReceiverObserver* observer =
       reinterpret_cast<RtpReceiverObserver*>(j_observer_pointer);
   if (observer) {
     delete observer;
   }
 }
 
 }  // namespace webrtc_jni