Clean up geolocation code now that it's all upstream.

chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.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.browser.preferences;
 
 import android.content.Context;
 import android.content.Intent;
 import android.location.LocationManager;
 import android.provider.Settings;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.chrome.browser.ChromiumApplication;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
 /**
  * Provides methods for querying Android system-wide location settings as well as Chrome's internal
  * location setting.
+ *
+ * This class should be used only on the UI thread.
  */
 public class LocationSettings {
 
     private static LocationSettings sInstance;
 
     protected final Context mContext;
 
     /**
      * Don't use this; use getInstance() instead. This should be used only by the Application inside
      * of createLocationSettings().
      */
     public LocationSettings(Context context) {
         mContext = context;
     }
 
     /**
      * Returns the singleton instance of LocationSettings, creating it if needed.
      */
     @SuppressFBWarnings("LI_LAZY_INIT_STATIC")
     public static LocationSettings getInstance() {
+        ThreadUtils.assertOnUiThread();
         if (sInstance == null) {
             ChromiumApplication application =
                     (ChromiumApplication) ApplicationStatus.getApplicationContext();
             sInstance = application.createLocationSettings();
         }
         return sInstance;
     }
 
     /**
      * Returns true if location is enabled system-wide and the Chrome location setting is enabled.
      */
     @CalledByNative
     public static boolean areAllLocationSettingsEnabled() {
-        try {
-            return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>(){
-                @Override
-                public Boolean call() throws Exception {
-                    LocationSettings settings = LocationSettings.getInstance();
-                    return settings.isChromeLocationSettingEnabled()
-                            && settings.isSystemLocationSettingEnabled();
-                }
-            });
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            return false;
-        }
+        LocationSettings settings = LocationSettings.getInstance();
+        return settings.isChromeLocationSettingEnabled()
+                && settings.isSystemLocationSettingEnabled();
     }
 
     /**
      * Returns whether Chrome's user-configurable location setting is enabled.
      */
     public boolean isChromeLocationSettingEnabled() {
         return PrefServiceBridge.getInstance().isAllowLocationEnabled();
     }
 
     /**
@@ skipping 14 matching lines @@
         Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
         i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return i;
     }
 
     @VisibleForTesting
     public static void setInstanceForTesting(LocationSettings instance) {
         sInstance = instance;
     }
 }