Update page info for new search geolocation system.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
index fbd196cdbf0938bcb96fcf3c6f17c6f9e2d101fa..68a38e87959aee029f05233c28d25bbaf24e357b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
@@ -61,6 +61,7 @@ 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.preferences.website.WebsitePreferenceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ssl.SecurityStateModel;
 import org.chromium.chrome.browser.tab.Tab;
@@ -617,12 +618,27 @@ public class WebsiteSettingsPopup implements OnClickListener {
                 assert false : "Invalid setting " + permission.setting + " for permission "
                         + permission.type;
         }
+        if (permission.type == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION
+                && WebsitePreferenceBridge.shouldUseDSEGeolocationSetting(mFullUrl, false)) {
+            status_text = statusTextForDSEPermission(permission);
+        }
         builder.append(status_text);
         permissionStatus.setText(builder);
         mPermissionsList.addView(permissionRow);
     }
 
     /**
+     * Update the permission string for the Default Search Engine.
+     */
+    private String statusTextForDSEPermission(PageInfoPermissionEntry permission) {
+        if (permission.setting == ContentSetting.ALLOW) {
+            return mContext.getString(R.string.page_info_dse_permission_allowed);
+        }
+
+        return mContext.getString(R.string.page_info_dse_permission_blocked);
+    }
+
+    /**
      * Sets the connection security summary and detailed description strings. These strings may be
      * overridden based on the state of the Android UI.
      */