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

chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java

 // Copyright 2016 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.Dialog;
-import android.content.Context;
 import android.content.pm.PackageManager;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
-import org.chromium.components.location.LocationUtils;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.AndroidPermissionDelegate;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.WindowAndroid.PermissionCallback;
 import org.chromium.ui.widget.TextViewWithClickableSpans;
 
@@ skipping 32 matching lines @@
         void nativeShowBluetoothOverviewLink(long nativeBluetoothChooserAndroid) {}
 
         @Override
         void nativeShowBluetoothAdapterOffLink(long nativeBluetoothChooserAndroid) {}
 
         @Override
         void nativeShowNeedLocationPermissionLink(long nativeBluetoothChooserAndroid) {}
     }
 
     private ActivityWindowAndroid mWindowAndroid;
-    private FakeLocationUtils mLocationUtils;
     private BluetoothChooserDialogWithFakeNatives mChooserDialog;
 
     public BluetoothChooserDialogTest() {
         super(ChromeActivity.class);
     }
 
     // ChromeActivityTestCaseBase:
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mLocationUtils = new FakeLocationUtils();
-        LocationUtils.setFactory(new LocationUtils.Factory() {
-            @Override
-            public LocationUtils create() {
-                return mLocationUtils;
-            }
-        });
         mChooserDialog = createDialog();
     }
 
     @Override
-    protected void tearDown() throws Exception {
-        LocationUtils.setFactory(null);
-        super.tearDown();
-    }
-
-    @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
     private BluetoothChooserDialogWithFakeNatives createDialog() {
         return ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<BluetoothChooserDialogWithFakeNatives>() {
                     @Override
                     public BluetoothChooserDialogWithFakeNatives call() {
                         mWindowAndroid = new ActivityWindowAndroid(getActivity());
@@ skipping 162 matching lines @@
             public void run() {
                 errorView.getClickableSpans()[0].onClick(errorView);
             }
         });
 
         // Permission was requested.
         MoreAsserts.assertEquals(permissionDelegate.mPermissionsRequested,
                 new String[] {Manifest.permission.ACCESS_COARSE_LOCATION});
         assertNotNull(permissionDelegate.mCallback);
         // Grant permission.
-        mLocationUtils.mLocationGranted = true;
+        permissionDelegate.mLocationGranted = true;
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 permissionDelegate.mCallback.onRequestPermissionsResult(
                         new String[] {Manifest.permission.ACCESS_FINE_LOCATION},
                         new int[] {PackageManager.PERMISSION_GRANTED});
             }
         });
 
         assertEquals(removeLinkTags(getActivity().getString(R.string.bluetooth_adapter_off_help)),
                 statusView.getText().toString());
 
         mChooserDialog.closeDialog();
     }
 
     // TODO(jyasskin): Test when the user denies Chrome the ability to ask for permission.
 
     private static class TestAndroidPermissionDelegate implements AndroidPermissionDelegate {
+        boolean mLocationGranted = false;
         PermissionCallback mCallback = null;
         String[] mPermissionsRequested = null;
 
         @Override
         public boolean hasPermission(String permission) {
-            return false;
+            return permission.equals(Manifest.permission.ACCESS_COARSE_LOCATION)
+                    && mLocationGranted;
         }
-
         @Override
         public boolean canRequestPermission(String permission) {
             return true;
         }
         @Override
         public boolean isPermissionRevokedByPolicy(String permission) {
             return false;
         }
         @Override
         public void requestPermissions(String[] permissions, PermissionCallback callback) {
             mPermissionsRequested = permissions;
             if (permissions.length == 1
                     && permissions[0].equals(Manifest.permission.ACCESS_COARSE_LOCATION)) {
                 mCallback = callback;
             }
         }
     }
-
-    private static class FakeLocationUtils extends LocationUtils {
-        public boolean mLocationGranted = false;
-
-        @Override
-        public boolean hasAndroidLocationPermission(Context context) {
-            return mLocationGranted;
-        }
-    }
 }