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 46e83e5d8fec2c160976dd598604e1b731be8123..854fcbbf7cbc8cb284de427757b0961759fb6a6a 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,8 +4,10 @@
 
 package org.chromium.chrome.test.util.browser;
 
+import android.content.Context;
+
 import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.preferences.LocationSettings;
+import org.chromium.components.location.LocationUtils;
 
 /**
  * Methods for testing location-related features.
@@ -19,10 +21,15 @@ public class LocationSettingsTestUtil {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                LocationSettings.setInstanceForTesting(new LocationSettings(null) {
+                LocationUtils.setFactory(new LocationUtils.Factory() {
                     @Override
-                    public boolean isSystemLocationSettingEnabled() {
-                        return enabled;
+                    public LocationUtils create() {
+                        return new LocationUtils() {
+                            @Override
+                            public boolean isSystemLocationSettingEnabled(Context context) {
+                                return enabled;
+                            }
+                        };
                     }
                 });
             }