bluetooth: Remove Context from Wrappers and use LocationUtils directly

device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java

 // Copyright 2015 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.bluetooth;
 
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCallback;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanFilter;
 import android.bluetooth.le.ScanResult;
 import android.bluetooth.le.ScanSettings;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.ParcelUuid;
 
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.components.location.LocationUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
 /**
  * Wrapper classes around android.bluetooth.* classes that provide an
  * indirection layer enabling fake implementations when running tests.
  *
  * Each Wrapper base class accepts an Android API object and passes through
  * calls to it. When under test, Fake subclasses override all methods that
  * pass through to the Android object and instead provide fake implementations.
  */
 @JNINamespace("device")
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 class Wrappers {
     private static final String TAG = "Bluetooth";
 
     public static final int DEVICE_CLASS_UNSPECIFIED = 0x1F00;
 
     /**
      * Wraps android.bluetooth.BluetoothAdapter.
      */
     static class BluetoothAdapterWrapper {
         private final BluetoothAdapter mAdapter;
-        protected final ContextWrapper mContext;
+        protected final Context mContext;
         protected BluetoothLeScannerWrapper mScannerWrapper;
 
         /**
          * Creates a BluetoothAdapterWrapper using the default
          * android.bluetooth.BluetoothAdapter. May fail if the default adapter
          * is not available or if the application does not have sufficient
          * permissions.
          */
         @CalledByNative("BluetoothAdapterWrapper")
         public static BluetoothAdapterWrapper createWithDefaultAdapter(Context context) {
@@ skipping 22 matching lines @@
             if (!hasLowEnergyFeature) {
                 Log.i(TAG, "BluetoothAdapterWrapper.create failed: No Low Energy support.");
                 return null;
             }
 
             BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
             if (adapter == null) {
                 Log.i(TAG, "BluetoothAdapterWrapper.create failed: Default adapter not found.");
                 return null;
             } else {
-                return new BluetoothAdapterWrapper(adapter, new ContextWrapper(context));
+                return new BluetoothAdapterWrapper(adapter, context);
             }
         }
 
-        public BluetoothAdapterWrapper(BluetoothAdapter adapter, ContextWrapper context) {
+        public BluetoothAdapterWrapper(BluetoothAdapter adapter, Context context) {
             mAdapter = adapter;
             mContext = context;
         }
 
         public boolean disable() {
             return mAdapter.disable();
         }
 
         public boolean enable() {
             return mAdapter.enable();
         }
 
         public String getAddress() {
             return mAdapter.getAddress();
         }
 
         public BluetoothLeScannerWrapper getBluetoothLeScanner() {
             BluetoothLeScanner scanner = mAdapter.getBluetoothLeScanner();
             if (scanner == null) {
                 return null;
             }
             if (mScannerWrapper == null) {
                 mScannerWrapper = new BluetoothLeScannerWrapper(scanner);
             }
             return mScannerWrapper;
         }
 
-        public ContextWrapper getContext() {
+        public Context getContext() {
             return mContext;
         }
 
         public String getName() {
             return mAdapter.getName();
         }
 
         public int getScanMode() {
             return mAdapter.getScanMode();
         }
 
         public boolean isDiscovering() {
             return mAdapter.isDiscovering();
         }
 
         public boolean isEnabled() {
             return mAdapter.isEnabled();
         }
     }
 
     /**

[scheib, 2016/06/30 20:52:34]

This is just spiffy, thanks for noticing.

-     * Wraps android.content.Context.
-     */
-    static class ContextWrapper {
-        private final Context mContext;
-
-        public ContextWrapper(Context context) {
-            mContext = context;
-        }
-
-        public boolean hasAndroidLocationPermission() {
-            return LocationUtils.getInstance().hasAndroidLocationPermission(mContext);
-        }
-
-        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
-            return mContext.registerReceiver(receiver, filter);
-        }
-
-        public void unregisterReceiver(BroadcastReceiver receiver) {
-            mContext.unregisterReceiver(receiver);
-        }
-    }
-
-    /**
      * Wraps android.bluetooth.BluetoothLeScanner.
      */
     static class BluetoothLeScannerWrapper {
         protected final BluetoothLeScanner mScanner;
         private final HashMap<ScanCallbackWrapper, ForwardScanCallbackToWrapper> mCallbacks;
 
         public BluetoothLeScannerWrapper(BluetoothLeScanner scanner) {
             mScanner = scanner;
             mCallbacks = new HashMap<ScanCallbackWrapper, ForwardScanCallbackToWrapper>();
         }
@@ skipping 390 matching lines @@
 
         public byte[] getValue() {
             return mDescriptor.getValue();
         }
 
         public boolean setValue(byte[] value) {
             return mDescriptor.setValue(value);
         }
     }
 }