Merge "Minor code tidying up in WebStorage & GeolocationPermission"

Author: Jonathan Dixon

core/java/android/webkit/GeolocationPermissions.java

@@ -18,14 +18,12 @@
 
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
+
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-
 /**
  * This class is used to manage permissions for the WebView's Geolocation
  * JavaScript API.
@@ -47,7 +45,7 @@
  * Geolocation permissions at any time.
  */
 // This class is the Java counterpart of the WebKit C++ GeolocationPermissions
-// class. It simply marshalls calls from the UI thread to the WebKit thread.
+// class. It simply marshals calls from the UI thread to the WebKit thread.
 //
 // Within WebKit, Geolocation permissions may be applied either temporarily
 // (for the duration of the page) or permanently. This class deals only with
@@ -70,9 +68,6 @@ public interface Callback {
         public void invoke(String origin, boolean allow, boolean retain);
     };
 
-    // Log tag
-    private static final String TAG = "geolocationPermissions";
-
     // Global instance
     private static GeolocationPermissions sInstance;
 

core/java/android/webkit/WebStorage.java

@@ -18,13 +18,10 @@
 
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 
 import java.util.Collection;
-import java.util.Map;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -44,9 +41,6 @@ public interface QuotaUpdater {
         public void updateQuota(long newQuota);
     };
 
-    // Log tag
-    private static final String TAG = "webstorage";
-
     // Global instance of a WebStorage
     private static WebStorage sWebStorage;