Remove AppRTCUtils.NonThreadSafe in AppRTC Android Demo

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

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
index 08d9691b0db3be820493bde48fba8c035b33a20a..413250d724e332958ceda49a7bd9e4c6193f519b 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
@@ -10,9 +10,6 @@
 
 package org.appspot.apprtc;
 
-import org.appspot.apprtc.util.AppRTCUtils;
-import org.appspot.apprtc.util.AppRTCUtils.NonThreadSafe;
-
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -21,6 +18,9 @@ import android.hardware.SensorManager;
 import android.os.Build;
 import android.util.Log;
 
+import org.appspot.apprtc.util.AppRTCUtils;
+import org.webrtc.ThreadUtils;
+
 /**
  * AppRTCProximitySensor manages functions related to the proximity sensor in
  * the AppRTC demo.
@@ -36,7 +36,7 @@ public class AppRTCProximitySensor implements SensorEventListener {
   // This class should be created, started and stopped on one thread
   // (e.g. the main thread). We use |nonThreadSafe| to ensure that this is
   // the case. Only active when |DEBUG| is set to true.
-  private final NonThreadSafe nonThreadSafe = new AppRTCUtils.NonThreadSafe();
+  private final ThreadUtils.ThreadChecker threadChecker = new ThreadUtils.ThreadChecker();
 
   private final Runnable onSensorStateListener;
   private final SensorManager sensorManager;
@@ -61,7 +61,7 @@ public class AppRTCProximitySensor implements SensorEventListener {
    * first time.
    */
   public boolean start() {
-    checkIfCalledOnValidThread();
+    threadChecker.checkIsOnValidThread();
     Log.d(TAG, "start" + AppRTCUtils.getThreadInfo());
     if (!initDefaultSensor()) {
       // Proximity sensor is not supported on this device.
@@ -74,7 +74,7 @@ public class AppRTCProximitySensor implements SensorEventListener {
 
   /** Deactivate the proximity sensor. */
   public void stop() {
-    checkIfCalledOnValidThread();
+    threadChecker.checkIsOnValidThread();
     Log.d(TAG, "stop" + AppRTCUtils.getThreadInfo());
     if (proximitySensor == null) {
       return;
@@ -84,13 +84,13 @@ public class AppRTCProximitySensor implements SensorEventListener {
 
   /** Getter for last reported state. Set to true if "near" is reported. */
   public boolean sensorReportsNearState() {
-    checkIfCalledOnValidThread();
+    threadChecker.checkIsOnValidThread();
     return lastStateReportIsNear;
   }
 
   @Override
   public final void onAccuracyChanged(Sensor sensor, int accuracy) {
-    checkIfCalledOnValidThread();
+    threadChecker.checkIsOnValidThread();
     AppRTCUtils.assertIsTrue(sensor.getType() == Sensor.TYPE_PROXIMITY);
     if (accuracy == SensorManager.SENSOR_STATUS_UNRELIABLE) {
       Log.e(TAG, "The values returned by this sensor cannot be trusted");
@@ -99,7 +99,7 @@ public class AppRTCProximitySensor implements SensorEventListener {
 
   @Override
   public final void onSensorChanged(SensorEvent event) {
-    checkIfCalledOnValidThread();
+    threadChecker.checkIsOnValidThread();
     AppRTCUtils.assertIsTrue(event.sensor.getType() == Sensor.TYPE_PROXIMITY);
     // As a best practice; do as little as possible within this method and
     // avoid blocking.
@@ -168,13 +168,4 @@ public class AppRTCProximitySensor implements SensorEventListener {
     Log.d(TAG, info.toString());
   }
 
-  /**
-   * Helper method for debugging purposes. Ensures that method is
-   * called on same thread as this object was created on.
-   */
-  private void checkIfCalledOnValidThread() {
-    if (!nonThreadSafe.calledOnValidThread()) {
-      throw new IllegalStateException("Method is not called on valid thread");
-    }
-  }
 }