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

chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java

 // Copyright 2013 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.pageinfo;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 41 matching lines @@
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.preferences.website.ContentSettingsResources;
 import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ssl.SecurityStateModel;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.UrlUtilities;
-import org.chromium.components.location.LocationUtils;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.WindowAndroid.PermissionCallback;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
 
 import java.net.URI;
@@ skipping 486 matching lines @@
     }
 
     private boolean hasAndroidPermission(int contentSettingType) {
         String androidPermission = PrefServiceBridge.getAndroidPermissionForContentSetting(
                 contentSettingType);
         return androidPermission == null
                 || (mContext.checkPermission(androidPermission, Process.myPid(), Process.myUid())
                            == PackageManager.PERMISSION_GRANTED);
     }
 
+    private boolean isAndroidLocationDisabled() {
+        try {
+            return Settings.Secure.getInt(mContext.getContentResolver(),
+                    Settings.Secure.LOCATION_MODE) == Settings.Secure.LOCATION_MODE_OFF;
+        } catch (Settings.SettingNotFoundException e) {
+            return false;
+        }
+    }
+
     /**
      * Adds a new row for the given permission.
      *
      * @param name The title of the permission to display to the user.
      * @param type The ContentSettingsType of the permission.
      * @param currentSettingValue The ContentSetting value of the currently selected setting.
      */
     @CalledByNative
     private void addPermissionSection(String name, int type, int currentSettingValue) {
         // We have at least one permission, so show the lower permissions area.
@@ skipping 19 matching lines @@
 
         ImageView permissionIcon = (ImageView) permissionRow.findViewById(
                 R.id.website_settings_permission_icon);
         permissionIcon.setImageResource(getImageResourceForPermission(permission.type));
 
         if (permission.setting == ContentSetting.ALLOW) {
             int warningTextResource = 0;
 
             // If warningTextResource is non-zero, then the view must be tagged with either
             // permission_intent_override or permission_type.
-            LocationUtils locationUtils = LocationUtils.getInstance();
             if (permission.type == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION
-                    && !locationUtils.isSystemLocationSettingEnabled(mContext)) {
+                    && isAndroidLocationDisabled()) {
                 warningTextResource = R.string.page_info_android_location_blocked;
                 permissionRow.setTag(R.id.permission_intent_override,
-                        locationUtils.getSystemLocationSettingsIntent());
+                        new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
             } else if (!hasAndroidPermission(permission.type)) {
                 warningTextResource = R.string.page_info_android_permission_blocked;
                 permissionRow.setTag(R.id.permission_type,
                         PrefServiceBridge.getAndroidPermissionForContentSetting(permission.type));
             }
 
             if (warningTextResource != 0) {
                 TextView permissionUnavailable = (TextView) permissionRow.findViewById(
                         R.id.website_settings_permission_unavailable_message);
                 permissionUnavailable.setVisibility(View.VISIBLE);
@@ skipping 301 matching lines @@
         offlinePageBridge.getPageByOfflineUrl(tab.getWebContents().getVisibleUrl(), callback);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeRecordWebsiteSettingsAction(
             long nativeWebsiteSettingsPopupAndroid, int action);
 }