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

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebUma.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.physicalweb;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.components.location.LocationUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * Centralizes UMA data collection for the Physical Web feature.
  */
@@ skipping 194 matching lines @@
     /**
      * Calculate a Physical Web state.
      * The Physical Web state includes:
      * - The location provider
      * - The location permission
      * - The bluetooth status
      * - The data connection status
      * - The Physical Web preference status
      */
     public static void recordPhysicalWebState(Context context, String actionName) {
-        LocationUtils locationUtils = LocationUtils.getInstance();
         handleEnum(context, createStateString(LOCATION_SERVICES, actionName),
-                locationUtils.isSystemLocationSettingEnabled(context) ? 1 : 0, BOOLEAN_BOUNDARY);
+                Utils.isLocationServicesEnabled(context) ? 1 : 0, BOOLEAN_BOUNDARY);
         handleEnum(context, createStateString(LOCATION_PERMISSION, actionName),
-                locationUtils.hasAndroidLocationPermission(context) ? 1 : 0, BOOLEAN_BOUNDARY);
+                Utils.isLocationPermissionGranted(context) ? 1 : 0, BOOLEAN_BOUNDARY);
         handleEnum(context, createStateString(BLUETOOTH, actionName),
                 Utils.getBluetoothEnabledStatus(context), TRISTATE_BOUNDARY);
         handleEnum(context, createStateString(DATA_CONNECTION, actionName),
                 Utils.isDataConnectionActive(context) ? 1 : 0, BOOLEAN_BOUNDARY);
         int preferenceState = 2;
         if (!PhysicalWeb.isOnboarding(context)) {
             preferenceState = PhysicalWeb.isPhysicalWebPreferenceEnabled(context) ? 1 : 0;
         }
         handleEnum(context, createStateString(PREFERENCE, actionName),
                 preferenceState, TRISTATE_BOUNDARY);
@@ skipping 205 matching lines @@
             if (values == null) {
                 Log.e(TAG, "Error reporting " + key + " with values: " + jsonEnumsStr);
                 return;
             }
             for (Integer value: values) {
                 RecordHistogram.recordEnumeratedHistogram(key, value, boundary);
             }
         }
     }
 }