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

chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
index 4d2b58b65bbabb7e806b20938a21537101587f58..52682e51d64a83db3f02d9e2d3846df670b395c3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
@@ -11,14 +11,10 @@ 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.
@@ -55,19 +51,9 @@ public class LocationSettings {
      */
     @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();

[Ted C, 2015/01/20 17:52:18]

Should we have a ThreadUtils.assertOnUiThread() here?

Does this actually matter if it's on the UI thread?

We might want to document it's thread safety-ness here and in the native bits.

[newt (away), 2015/01/20 22:46:08]

Added ThreadUtils.assertOnUiThread() to LocationSettings.getInstance(), which is
where it really matters.

Also, added a comment about only using on the UI thread.

+        return settings.isChromeLocationSettingEnabled()
+                && settings.isSystemLocationSettingEnabled();
     }
 
     /**