Speculative revert of r174937 to see if it clears up content_browsertests failure at Linux ASAN Tests (3).

> small improvement to GeolocationPermissions.clearAll() to
> avoid thread & disk churn when clearing many entries, and fix
> some warnings.
> 
> BUG=
> 
> Review URL: https://chromiumcodereview.appspot.com/11724003

TBR=joth@chromium.org
Review URL: https://codereview.chromium.org/11740024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174978 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 10 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwGeolocationPermissions.java b/android_webview/java/src/org/chromium/android_webview/AwGeolocationPermissions.java
index 133f597..7b4b945 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwGeolocationPermissions.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwGeolocationPermissions.java
@@ -7,6 +7,7 @@ package org.chromium.android_webview;
 import android.content.SharedPreferences;
 import android.webkit.ValueCallback;
 
+import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.net.GURLUtils;
 
@@ -50,18 +51,11 @@ public final class AwGeolocationPermissions {
     }
 
     public void clearAll() {
-        SharedPreferences.Editor editor = null;
         for (String name : mSharedPreferences.getAll().keySet()) {
             if (name.startsWith(PREF_PREFIX)) {
-                if (editor == null) {
-                    editor = mSharedPreferences.edit();
-                }
-                editor.remove(name);
+                mSharedPreferences.edit().remove(name).apply();
             }
         }
-        if (editor != null) {
-            editor.apply();
-        }
     }
 
     public void getAllowed(String origin, final ValueCallback<Boolean> callback) {
@@ -76,7 +70,6 @@ public final class AwGeolocationPermissions {
         }
         final boolean finalAllowed = allowed;
         ThreadUtils.postOnUiThread(new Runnable() {
-            @Override
             public void run() {
                 callback.onReceiveValue(finalAllowed);
             }
@@ -91,7 +84,6 @@ public final class AwGeolocationPermissions {
             }
         }
         ThreadUtils.postOnUiThread(new Runnable() {
-            @Override
             public void run() {
                 callback.onReceiveValue(origins);
             }