diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index fb0b2ba..1370722 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -98,8 +98,8 @@
                 }
             }
         });
-        GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
-            public void onReceiveValue(Set geolocationOrigins) {
+        GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+            public void onReceiveValue(Set<String> geolocationOrigins) {
                 if ((geolocationOrigins != null) && !geolocationOrigins.isEmpty()) {
                     websiteSettings.setEnabled(true);
                 }
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index bb369ae..d7b091f 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -530,8 +530,8 @@
             }
         });
 
-        GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
-            public void onReceiveValue(Set geolocationOrigins) {
+        GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+            public void onReceiveValue(Set<String> geolocationOrigins) {
                 if ((geolocationOrigins != null) && !geolocationOrigins.isEmpty()) {
                     screen.setEnabled(true);
                 }
diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index a04c46f..430286f 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -226,8 +226,8 @@
         }
 
         public void askForGeolocation(final Map sites) {
-            GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set>() {
-                public void onReceiveValue(Set origins) {
+            GeolocationPermissions.getInstance().getOrigins(new ValueCallback<Set<String> >() {
+                public void onReceiveValue(Set<String> origins) {
                     if (origins != null) {
                         Iterator<String> iter = origins.iterator();
                         while (iter.hasNext()) {
