When location is turned off in system, make sure we don't show the Allowed/Blocked list.

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java
index 74ea7f49f38c5073eb48be83133eb9a469d1396b..35a2e80d520e485e806e29e76138485f511bff4e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java
@@ -92,6 +92,11 @@ public class WebsitePreferences extends PreferenceFragment
     private static final String BLOCKED_GROUP = "blocked_group";
 
     private void getInfoForOrigins() {
+        if (mFilter.showGeolocationSites(mCategoryFilter)
+                && !LocationSettings.getInstance().isSystemLocationSettingEnabled()) {
+            return;  // No need to fetch any data if we're not going to show it.
+        }
+
         WebsitePermissionsFetcher fetcher = new WebsitePermissionsFetcher(new ResultsPopulator());
         fetcher.fetchPreferencesWithFilter(mCategoryFilter);
     }
@@ -572,6 +577,8 @@ public class WebsitePreferences extends PreferenceFragment
                     && (LocationSettings.getInstance().isChromeLocationSettingEnabled()
                                || !isCategoryManaged())) {
                 getPreferenceScreen().removePreference(globalToggle);
+                getPreferenceScreen().removePreference(allowedGroup);
+                getPreferenceScreen().removePreference(blockedGroup);
 
                 // Show the link to system settings since system location is disabled.
                 ChromeBasePreference locationMessage =