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

chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.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.chrome.browser;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.components.location.LocationUtils;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 
 /**
  * A dialog for picking available Bluetooth devices. This dialog is shown when a website requests to
  * pair with a certain class of Bluetooth devices (e.g. through a bluetooth.requestDevice Javascript
  * call).
  */
@@ skipping 123 matching lines @@
                 } else {
                     checkLocationPermission();
                 }
                 return;
             }
         }
         // If the location permission is not present, leave the currently-shown message in place.
     }
 
     private void checkLocationPermission() {
-        if (LocationUtils.getInstance().hasAndroidLocationPermission(mActivity)) {
+        if (mWindowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+                || mWindowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
             return;
         }
 
         if (!mWindowAndroid.canRequestPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
             if (mNativeBluetoothChooserDialogPtr != 0) {
                 nativeOnDialogFinished(
                         mNativeBluetoothChooserDialogPtr, DIALOG_FINISHED_DENIED_PERMISSION, "");
                 return;
             }
         }
@@ skipping 72 matching lines @@
             }
 
             // Get rid of the highlight background on selection.
             view.invalidate();
         }
     }
 
     @CalledByNative
     private static BluetoothChooserDialog create(WindowAndroid windowAndroid, String origin,
             int securityLevel, long nativeBluetoothChooserDialogPtr) {
-        if (!LocationUtils.getInstance().hasAndroidLocationPermission(
-                    windowAndroid.getActivity().get())
+        if (!windowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+                && !windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
                 && !windowAndroid.canRequestPermission(
                            Manifest.permission.ACCESS_COARSE_LOCATION)) {
             // If we can't even ask for enough permission to scan for Bluetooth devices, don't open
             // the dialog.
             return null;
         }
         BluetoothChooserDialog dialog = new BluetoothChooserDialog(
                 windowAndroid, origin, securityLevel, nativeBluetoothChooserDialogPtr);
         dialog.show();
         return dialog;
@@ skipping 69 matching lines @@
     @VisibleForTesting
     native void nativeRestartSearch(long nativeBluetoothChooserAndroid);
     // Help links.
     @VisibleForTesting
     native void nativeShowBluetoothOverviewLink(long nativeBluetoothChooserAndroid);
     @VisibleForTesting
     native void nativeShowBluetoothAdapterOffLink(long nativeBluetoothChooserAndroid);
     @VisibleForTesting
     native void nativeShowNeedLocationPermissionLink(long nativeBluetoothChooserAndroid);
 }