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

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java
index 854fcbbf7cbc8cb284de427757b0961759fb6a6a..46e83e5d8fec2c160976dd598604e1b731be8123 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/LocationSettingsTestUtil.java
@@ -4,10 +4,8 @@
 
 package org.chromium.chrome.test.util.browser;
 
-import android.content.Context;
-
 import org.chromium.base.ThreadUtils;
-import org.chromium.components.location.LocationUtils;
+import org.chromium.chrome.browser.preferences.LocationSettings;
 
 /**
  * Methods for testing location-related features.
@@ -21,15 +19,10 @@
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                LocationUtils.setFactory(new LocationUtils.Factory() {
+                LocationSettings.setInstanceForTesting(new LocationSettings(null) {
                     @Override
-                    public LocationUtils create() {
-                        return new LocationUtils() {
-                            @Override
-                            public boolean isSystemLocationSettingEnabled(Context context) {
-                                return enabled;
-                            }
-                        };
+                    public boolean isSystemLocationSettingEnabled() {
+                        return enabled;
                     }
                 });
             }