Refactoring DevTools bridge tests: moving interface adapters to SignalingReceiverProxy.

components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java

Index: components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java
diff --git a/components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java b/components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java
index 202b477b4b28af50d9a736a51758a061893f1ea8..34d71f176e8754309d0c3f7d712879891a1d586a 100644
--- a/components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java
+++ b/components/devtools_bridge/test/android/javatests/src/org/chromium/components/devtools_bridge/ClientSessionTestingHost.java
@@ -5,7 +5,6 @@
 package org.chromium.components.devtools_bridge;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * Helper class which handles a client session in tests. Having direct reference to
@@ -13,11 +12,12 @@ import java.util.List;
  * between them to satisfy theading requirements.
  */
 public class ClientSessionTestingHost {
+    private static final String SESSION_ID = "ID";
+
     private final SignalingReceiver mTarget;
     private final SessionBase.Executor mTargetExecutor;
     private final LocalSessionBridge.ThreadedExecutor mClientExecutor;
     private final String mSessionId;
-    private int mDelayMs = 10;
     private final ClientSession mClientSession;
 
     public ClientSessionTestingHost(
@@ -30,10 +30,14 @@ public class ClientSessionTestingHost {
         mClientExecutor = new LocalSessionBridge.ThreadedExecutor();
 
         mSessionId = sessionId;
+
+        SignalingReceiverProxy proxy = new SignalingReceiverProxy(
+                mTargetExecutor, mClientExecutor, target, 0);
+
         mClientSession = new ClientSession(
                 factory,
                 mClientExecutor,
-                new TargetAdaptor().createProxy(),
+                proxy.asServerSession(SESSION_ID),
                 clientSocketName);
     }
 
@@ -54,39 +58,4 @@ public class ClientSessionTestingHost {
             }
         });
     }
-
-    /**
-     * Adapts ServerSessionInterface to DevToolsBridgeServer. Lives on mServerExecutor.
-     */
-    private class TargetAdaptor implements SessionBase.ServerSessionInterface {
-        /**
-         * Creates proxy that to safely use on mClientExecutor.
-         */
-        public LocalSessionBridge.ServerSessionProxy createProxy() {
-            LocalSessionBridge.ServerSessionProxy proxy =
-                    new LocalSessionBridge.ServerSessionProxy(
-                            mTargetExecutor, mClientExecutor, this, mDelayMs);
-            assert proxy.clientExecutor() == mClientExecutor;
-            assert proxy.serverExecutor() == mTargetExecutor;
-            return proxy;
-        }
-
-        @Override
-        public void startSession(RTCConfiguration config,
-                                 String offer,
-                                 SessionBase.NegotiationCallback callback) {
-            mTarget.startSession(mSessionId, config, offer, callback);
-        }
-
-        @Override
-        public void renegotiate(String offer, SessionBase.NegotiationCallback callback) {
-            mTarget.renegotiate(mSessionId, offer, callback);
-        }
-
-        @Override
-        public void iceExchange(List<String> clientCandidates,
-                                SessionBase.IceExchangeCallback callback) {
-            mTarget.iceExchange(mSessionId, clientCandidates, callback);
-        }
-    }
 }