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

 // 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.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.
  */
 public class LocationSettingsTestUtil {
 
     /**
      * Mocks the system location setting as either enabled or disabled. Can be called on any thread.
      */
     public static void setSystemLocationSettingEnabled(final boolean enabled) {
         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;
                     }
                 });
             }
         });
     }
 }