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/PhysicalWebDiagnosticsPage.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.physicalweb;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
 import android.text.Html;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.components.location.LocationUtils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * Provides diagnostic information about the Physical Web feature.
  */
 public class PhysicalWebDiagnosticsPage implements NativePage {
     private final Context mContext;
     private final int mBackgroundColor;
@@ skipping 61 matching lines @@
                 return;
         }
 
         sb.append(String.format("<font color=\"%s\">%s</font><br/>", color, message));
     }
 
     private void appendPrerequisitesReport(StringBuilder sb) {
         boolean isSdkVersionCorrect = isSdkVersionCorrect();
         boolean isDataConnectionActive = Utils.isDataConnectionActive(mContext);
         int bluetoothStatus = Utils.getBluetoothEnabledStatus(mContext);
-        LocationUtils locationUtils = LocationUtils.getInstance();
-        boolean isLocationServicesEnabled = locationUtils.isSystemLocationSettingEnabled(mContext);
-        boolean isLocationPermissionGranted = locationUtils.hasAndroidLocationPermission(mContext);
+        boolean isLocationServicesEnabled = Utils.isLocationServicesEnabled(mContext);
+        boolean isLocationPermissionGranted = Utils.isLocationPermissionGranted(mContext);
         boolean isPreferenceEnabled = PhysicalWeb.isPhysicalWebPreferenceEnabled(mContext);
         boolean isOnboarding = PhysicalWeb.isOnboarding(mContext);
 
         int prerequisitesResult = Utils.RESULT_SUCCESS;
         if (!isSdkVersionCorrect
                 || !isDataConnectionActive
                 || bluetoothStatus == Utils.RESULT_FAILURE
                 || !isLocationServicesEnabled
                 || !isLocationPermissionGranted
                 || !isPreferenceEnabled) {
@@ skipping 123 matching lines @@
     @Override
     public String getHost() {
         return UrlConstants.PHYSICAL_WEB_HOST;
     }
 
     @Override
     public void updateForUrl(String url) {
         // nothing to do
     }
 }