Revert of Add a LocationUtils class to give all Chromium Android code access to location helpers.

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 android.os.Process;
 
 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.
  *
@@ skipping 112 matching lines @@
     /**
      * 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 boolean checkPermission(String permission) {
+            return mContext.checkPermission(permission, Process.myPid(), Process.myUid())
+                    == PackageManager.PERMISSION_GRANTED;
         }
 
         public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
             return mContext.registerReceiver(receiver, filter);
         }
 
         public void unregisterReceiver(BroadcastReceiver receiver) {
             mContext.unregisterReceiver(receiver);
         }
     }
@@ skipping 402 matching lines @@
 
         public byte[] getValue() {
             return mDescriptor.getValue();
         }
 
         public boolean setValue(byte[] value) {
             return mDescriptor.setValue(value);
         }
     }
 }