Replace LooperExecutor with built-in class in Android AppRTC Demo

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

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
index 996483ec1d73dc9057aa035a6b7871f4642362ef..df6f29ab1381f39ef917886c982e89343d5b45f8 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
@@ -12,7 +12,7 @@ package org.appspot.apprtc;
 
 import android.util.Log;
 
-import org.appspot.apprtc.util.LooperExecutor;
+import org.appspot.apprtc.util.AppRTCUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -22,6 +22,7 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.util.concurrent.ExecutorService;
 
 /**
  * Replacement for WebSocketChannelClient for direct communication between two IP addresses. Handles
@@ -34,7 +35,8 @@ import java.net.UnknownHostException;
 public class TCPChannelClient {
   private static final String TAG = "TCPChannelClient";
 
-  private final LooperExecutor executor;
+  private final ExecutorService executor;
+  private AppRTCUtils.NonThreadSafe executorThreadCheck;

[magjed_webrtc, 2016/05/19 12:07:54]

Can you use ThreadUtils.ThreadChecker in
webrtc/base/java/src/org/webrtc/ThreadUtils.java instead? (And nuke
AppRTCUtils.NonThreadSafe in a separate CL).

Also, make thread checker final and initialize here or in the ctor, and call
detachThread() in the ctor. Then remove checkIfCalledOnValidThread() and inline
all uses with executorThreadCheck.calledOnValidThread().

[sakal, 2016/05/19 12:39:03]

Done.

   private final TCPChannelEvents eventListener;
   private TCPSocket socket;
 
@@ -58,7 +60,7 @@ public class TCPChannelClient {
    * @param port Port to listen on or connect to.
    */
   public TCPChannelClient(
-      LooperExecutor executor, TCPChannelEvents eventListener, String ip, int port) {
+      ExecutorService executor, TCPChannelEvents eventListener, String ip, int port) {
     this.executor = executor;
     this.eventListener = eventListener;
 
@@ -117,7 +119,11 @@ public class TCPChannelClient {
    * Ensures that TCPChannelClient method is called on a looper thread.
    */
   private void checkIfCalledOnValidThread() {
-    if (!executor.checkOnLooperThread()) {
+    if(executorThreadCheck == null) {
+      executorThreadCheck = new AppRTCUtils.NonThreadSafe();
+    }
+
+    if (!executorThreadCheck.calledOnValidThread()) {
       throw new IllegalStateException(
           "TCPChannelClient method is not called on valid thread");
     }