Android: Remove GetApplicationContext part 4

device/sensors/android/java/src/org/chromium/device/sensors/DeviceSensors.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.device.sensors;
 
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Handler;
 import android.os.HandlerThread;
 
 import org.chromium.base.CollectionUtil;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /**
  * Android implementation of the device {motion|orientation} APIs.
  */
 @JNINamespace("device")
 class DeviceSensors implements SensorEventListener {
     private static final String TAG = "DeviceSensors";
 
     // Matches kEnableExperimentalWebPlatformFeatures.
     private static final String EXPERIMENTAL_WEB_PLAFTORM_FEATURES =
             "enable-experimental-web-platform-features";
 
     // These fields are lazily initialized by getHandler().
     private Thread mThread;
     private Handler mHandler;
 
-    // A reference to the application context in order to acquire the SensorService.
-    private final Context mAppContext;
-
     // The lock to access the mHandler.
     private final Object mHandlerLock = new Object();
 
     // Non-zero if and only if we're listening for events.
     // To avoid race conditions on the C++ side, access must be synchronized.
     private long mNativePtr;
 
     // The lock to access the mNativePtr.
     private final Object mNativePtrLock = new Object();
 
@@ skipping 27 matching lines @@
     @VisibleForTesting
     final Set<Integer> mActiveSensors = new HashSet<Integer>();
     final List<Set<Integer>> mOrientationSensorSets;
     Set<Integer> mDeviceOrientationSensors;
     boolean mDeviceMotionIsActive;
     boolean mDeviceOrientationIsActive;
     boolean mDeviceOrientationIsActiveWithBackupSensors;
     boolean mDeviceOrientationAbsoluteIsActive;
     boolean mOrientationNotAvailable;
 
-    protected DeviceSensors(Context context) {
-        mAppContext = context.getApplicationContext();
-
+    protected DeviceSensors() {
         mOrientationSensorSets = CollectionUtil.newArrayList(DEVICE_ORIENTATION_SENSORS_A,
                 DEVICE_ORIENTATION_SENSORS_B, DEVICE_ORIENTATION_SENSORS_C);
     }
 
     // For orientation we use a 3-way fallback approach where up to 3 different sets of sensors
     // are attempted if necessary. The sensors to be used for orientation are determined in the
     // following order:
     //   A: GAME_ROTATION_VECTOR (relative)
     //   B: ROTATION_VECTOR (absolute)
     //   C: combination of ACCELEROMETER and MAGNETIC_FIELD (absolute)
@@ skipping 312 matching lines @@
                 Math.toDegrees(mRotationAngles[2]));
     }
 
     private SensorManagerProxy getSensorManagerProxy() {
         if (mSensorManagerProxy != null) {
             return mSensorManagerProxy;
         }
 
         ThreadUtils.assertOnUiThread();
         SensorManager sensorManager =
-                (SensorManager) mAppContext.getSystemService(Context.SENSOR_SERVICE);
+                (SensorManager) ContextUtils.getApplicationContext().getSystemService(
+                        Context.SENSOR_SERVICE);
 
         if (sensorManager != null) {
             mSensorManagerProxy = new SensorManagerProxyImpl(sensorManager);
         }
         return mSensorManagerProxy;
     }
 
     @VisibleForTesting
     void setSensorManagerProxy(SensorManagerProxy sensorManagerProxy) {
         mSensorManagerProxy = sensorManagerProxy;
@@ skipping 121 matching lines @@
             if (mHandler == null) {
                 HandlerThread thread = new HandlerThread("DeviceMotionAndOrientation");
                 thread.start();
                 mHandler = new Handler(thread.getLooper()); // blocks on thread start
             }
             return mHandler;
         }
     }
 
     @CalledByNative
-    static DeviceSensors create(Context appContext) {
-        return new DeviceSensors(appContext);
+    static DeviceSensors create() {
+        return new DeviceSensors();
     }
 
     /**
      * Native JNI calls,
      * see device/sensors/sensor_manager_android.cc
      */
 
     /**
      * Orientation of the device with respect to its reference frame.
      */
@@ skipping 60 matching lines @@
                 mSensorManager.unregisterListener(listener, sensors.get(0));
             } catch (IllegalArgumentException e) {
                 // Suppress occasional exception on Digma iDxD* devices:
                 // Receiver not registered: android.hardware.SystemSensorManager$1
                 // See crbug.com/596453.
                 Log.w(TAG, "Failed to unregister device sensor " + sensors.get(0).getName());
             }
         }
     }
 }