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

Unified Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java

Issue 2741743002: IdlingResource for destroy() VideoFileRenderer (Closed)
Patch Set: Removal of counting resource Created 3 years, 9 months 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
Index: webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
index 28eef2e51e5f55f54835f14a2ec4a4ddc286578a..66f682438a607c2253c1032ae9fa2f6e550c24b5 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
@@ -131,7 +131,16 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents
// Helper functions to get connection, post message and leave message URLs
private String getConnectionUrl(RoomConnectionParameters connectionParameters) {
- return connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId;
+ StringBuilder builder = new StringBuilder(
+ connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId);
+ if (connectionParameters.colliderUrl != null) {
+ // TODO false for wstls to disable https, should be option later or if URL is http
+ builder.append("?wstls=false");
+ builder.append("?debug=loopback");
+ builder.append("?ts=");
+ builder.append("?wshpp=").append(connectionParameters.colliderUrl);
+ }
+ return builder.toString();
}
private String getMessageUrl(

Powered by Google App Engine
This is Rietveld 408576698