Revert of Add the url attribute to the IceCandidate (Java Wrapper) (patchset #4 id:120001 of https://codereview.webrtc.org/2690593002/ )

Reason for revert:
Breaks AppRTCMobile interoperability. The ICE candidate URL shouldn't be signaled between endpoints, it's only there for informational purposes.

Original issue's description:
> Add the url attribute to the IceCandidate (Java Wrapper)
>
> The url of the ICE server is added to the IceCandiate class.
> This can be used to tell which server this candidate was gathered from.
>
> BUG=webrtc:7128
>
> Review-Url: https://codereview.webrtc.org/2690593002
> Cr-Original-Commit-Position: refs/heads/master@{#16593}
> Committed: 8586c8ee88
> Review-Url: https://codereview.webrtc.org/2690593002
> Cr-Commit-Position: refs/heads/master@{#16615}
> Committed: 45efce01c7

TBR=magjed@webrtc.org,zhihuang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7128

Review-Url: https://codereview.webrtc.org/2699533002
Cr-Commit-Position: refs/heads/master@{#16616}

webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java

@@ -187,7 +187,6 @@ public class DirectRTCClient implements AppRTCClient, TCPChannelClient.TCPChanne
         jsonPut(json, "label", candidate.sdpMLineIndex);
         jsonPut(json, "id", candidate.sdpMid);
         jsonPut(json, "candidate", candidate.sdp);
-        jsonPut(json, "url", candidate.serverUrl);
 
         if (roomState != ConnectionState.CONNECTED) {
           reportError("Sending ICE candidate in non connected state.");
@@ -337,13 +336,12 @@ public class DirectRTCClient implements AppRTCClient, TCPChannelClient.TCPChanne
     jsonPut(json, "label", candidate.sdpMLineIndex);
     jsonPut(json, "id", candidate.sdpMid);
     jsonPut(json, "candidate", candidate.sdp);
-    jsonPut(json, "url", candidate.serverUrl);
     return json;
   }
 
   // Converts a JSON candidate to a Java object.
   private static IceCandidate toJavaCandidate(JSONObject json) throws JSONException {
-    return new IceCandidate(json.getString("id"), json.getInt("label"), json.getString("candidate"),
+    return new IceCandidate(
-        json.getString("url"));
+        json.getString("id"), json.getInt("label"), json.getString("candidate"));
   }
 }

webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java

@@ -115,8 +115,8 @@ public class RoomParametersFetcher {
             offerSdp = new SessionDescription(
                 SessionDescription.Type.fromCanonicalForm(messageType), message.getString("sdp"));
           } else if (messageType.equals("candidate")) {
-            IceCandidate candidate = new IceCandidate(message.getString("id"),
+            IceCandidate candidate = new IceCandidate(
-                message.getInt("label"), message.getString("candidate"), message.getString("url"));
+                message.getString("id"), message.getInt("label"), message.getString("candidate"));
             iceCandidates.add(candidate);
           } else {
             Log.e(TAG, "Unknown message: " + messageString);

webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java

@@ -408,13 +408,12 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents
     jsonPut(json, "label", candidate.sdpMLineIndex);
     jsonPut(json, "id", candidate.sdpMid);
     jsonPut(json, "candidate", candidate.sdp);
-    jsonPut(json, "url", candidate.serverUrl);
     return json;
   }
 
   // Converts a JSON candidate to a Java object.
   IceCandidate toJavaCandidate(JSONObject json) throws JSONException {
-    return new IceCandidate(json.getString("id"), json.getInt("label"), json.getString("candidate"),
+    return new IceCandidate(
-        json.getString("url"));
+        json.getString("id"), json.getInt("label"), json.getString("candidate"));
   }
 }

webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java

@@ -41,7 +41,6 @@ public class DirectRTCClientTest {
 
   private static final String DUMMY_SDP_MID = "sdpMid";
   private static final String DUMMY_SDP = "sdp";
-  private static final String DUMMY_SERVER_URL = "serverUrl";
 
   public static final int SERVER_WAIT = 100;
   public static final int NETWORK_TIMEOUT = 1000;
@@ -137,7 +136,7 @@ public class DirectRTCClientTest {
     verify(serverEvents, timeout(NETWORK_TIMEOUT))
         .onRemoteDescription(isNotNull(SessionDescription.class));
 
-    IceCandidate candidate = new IceCandidate(DUMMY_SDP_MID, 0, DUMMY_SDP, DUMMY_SERVER_URL);
+    IceCandidate candidate = new IceCandidate(DUMMY_SDP_MID, 0, DUMMY_SDP);
     server.sendLocalIceCandidate(candidate);
     verify(clientEvents, timeout(NETWORK_TIMEOUT))
         .onRemoteIceCandidate(isNotNull(IceCandidate.class));

webrtc/sdk/android/api/org/webrtc/IceCandidate.java

@@ -18,24 +18,14 @@ public class IceCandidate {
   public final String sdpMid;
   public final int sdpMLineIndex;
   public final String sdp;
-  public final String serverUrl;
 
-  @Deprecated
   public IceCandidate(String sdpMid, int sdpMLineIndex, String sdp) {
     this.sdpMid = sdpMid;
     this.sdpMLineIndex = sdpMLineIndex;
     this.sdp = sdp;
-    this.serverUrl = "";
-  }
-
-  public IceCandidate(String sdpMid, int sdpMLineIndex, String sdp, String serverUrl) {
-    this.sdpMid = sdpMid;
-    this.sdpMLineIndex = sdpMLineIndex;
-    this.sdp = sdp;
-    this.serverUrl = serverUrl;
   }
 
   public String toString() {
-    return sdpMid + ":" + sdpMLineIndex + ":" + sdp + ":" + serverUrl;
+    return sdpMid + ":" + sdpMLineIndex + ":" + sdp;
   }
 }

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

@@ -245,16 +245,12 @@ class PCOJava : public PeerConnectionObserver {
     std::string sdp;
     RTC_CHECK(candidate->ToString(&sdp)) << "got so far: " << sdp;
     jclass candidate_class = FindClass(jni(), "org/webrtc/IceCandidate");
-    jmethodID ctor = GetMethodID(
+    jmethodID ctor = GetMethodID(jni(), candidate_class,
-        jni(), candidate_class, "<init>",
+        "<init>", "(Ljava/lang/String;ILjava/lang/String;)V");
-        "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V");
     jstring j_mid = JavaStringFromStdString(jni(), candidate->sdp_mid());
     jstring j_sdp = JavaStringFromStdString(jni(), sdp);
-    jstring j_url =
+    jobject j_candidate = jni()->NewObject(candidate_class, ctor, j_mid,
-        JavaStringFromStdString(jni(), candidate->candidate().url());
+                                           candidate->sdp_mline_index(), j_sdp);
-    jobject j_candidate =
-        jni()->NewObject(candidate_class, ctor, j_mid,
-                         candidate->sdp_mline_index(), j_sdp, j_url);
     CHECK_EXCEPTION(jni()) << "error during NewObject";
     jmethodID m = GetMethodID(jni(), *j_observer_class_,
                               "onIceCandidate", "(Lorg/webrtc/IceCandidate;)V");