Seperate interface and implementation of 4 WebView classes

GeolocationPermissionsClassic
CookieManagerClassic
WebIconDatabaseClassic
WebStorageClassic

Also creats a WebViewFactory top level class - this remains hidden
for now, as it's currently only used implicitly by the other
public WebView classes to create the provider instances.

Bug: 5626244

Change-Id: Id0ca1c16d8058f31a86414bbc0e8a55db4b907ba

Author: Jonathan Dixon

core/java/android/webkit/CookieManager.java

@@ -16,27 +16,20 @@
 
 package android.webkit;
 
-import android.net.ParseException;
 import android.net.WebAddress;
-import android.os.AsyncTask;
-import android.util.Log;
-
 
 /**
  * Manages the cookies used by an application's {@link WebView} instances.
  * Cookies are manipulated according to RFC2109.
  */
 public class CookieManager {
-
-    private static CookieManager sRef;
-
-    private static final String LOGTAG = "webkit";
-
-    private int mPendingCookieOperations = 0;
-
-    private CookieManager() {
+    /**
+     * @hide Only for use by WebViewProvider implementations
+     */
+    protected CookieManager() {
     }
 
+    @Override
     protected Object clone() throws CloneNotSupportedException {
         throw new CloneNotSupportedException("doesn't implement Cloneable");
     }
@@ -46,14 +39,11 @@ protected Object clone() throws CloneNotSupportedException {
      * before the application instantiates a {@link WebView} instance,
      * {@link CookieSyncManager#createInstance(Context)} must be called
      * first.
-     * 
+     *
      * @return The singleton CookieManager instance
      */
     public static synchronized CookieManager getInstance() {
-        if (sRef == null) {
-            sRef = new CookieManager();
-        }
-        return sRef;
+        return WebViewFactory.getProvider().getCookieManager();
     }
 
     /**
@@ -63,7 +53,7 @@ public static synchronized CookieManager getInstance() {
      *               cookies
      */
     public synchronized void setAcceptCookie(boolean accept) {
-        nativeSetAcceptCookie(accept);
+        throw new MustOverrideException();
     }
 
     /**
@@ -72,39 +62,20 @@ public synchronized void setAcceptCookie(boolean accept) {
      * @return True if {@link WebView} instances send and accept cookies
      */
     public synchronized boolean acceptCookie() {
-        return nativeAcceptCookie();
+        throw new MustOverrideException();
     }
 
-    /**
+     /**
      * Sets a cookie for the given URL. Any existing cookie with the same host,
      * path and name will be replaced with the new cookie. The cookie being set
      * must not have expired and must not be a session cookie, otherwise it
      * will be ignored.
      * @param url The URL for which the cookie is set
-     * @param value The cookie as a string, using the format of the
-     *              'Set-Cookie' HTTP response header
+     * @param value The cookie as a string, using the format of the 'Set-Cookie'
+     *              HTTP response header
      */
     public void setCookie(String url, String value) {
-        setCookie(url, value, false);
-    }
-
-    /**
-     * See {@link setCookie(String, String)}
-     * @param url The URL for which the cookie is set
-     * @param value The value of the cookie, as a string, using the format of
-     *              the 'Set-Cookie' HTTP response header
-     * @param privateBrowsing Whether to use the private browsing cookie jar
-     */
-    void setCookie(String url, String value, boolean privateBrowsing) {
-        WebAddress uri;
-        try {
-            uri = new WebAddress(url);
-        } catch (ParseException ex) {
-            Log.e(LOGTAG, "Bad address: " + url);
-            return;
-        }
-
-        nativeSetCookie(uri.toString(), value, privateBrowsing);
+        throw new MustOverrideException();
     }
 
     /**
@@ -114,27 +85,19 @@ void setCookie(String url, String value, boolean privateBrowsing) {
      *               HTTP request header
      */
     public String getCookie(String url) {
-        return getCookie(url, false);
+        throw new MustOverrideException();
     }
 
     /**
-     * See {@link getCookie(String)}
+     * See {@link #getCookie(String)}
      * @param url The URL for which the cookies are requested
      * @param privateBrowsing Whether to use the private browsing cookie jar
      * @return value The cookies as a string, using the format of the 'Cookie'
      *               HTTP request header
      * @hide Used by Browser, no intention to publish.
      */
     public String getCookie(String url, boolean privateBrowsing) {
-        WebAddress uri;
-        try {
-            uri = new WebAddress(url);
-        } catch (ParseException ex) {
-            Log.e(LOGTAG, "Bad address: " + url);
-            return null;
-        }
-
-        return nativeGetCookie(uri.toString(), privateBrowsing);
+        throw new MustOverrideException();
     }
 
     /**
@@ -146,87 +109,55 @@ public String getCookie(String url, boolean privateBrowsing) {
      * @hide Used by RequestHandle, no intention to publish.
      */
     public synchronized String getCookie(WebAddress uri) {
-        return nativeGetCookie(uri.toString(), false);
-    }
-
-    /**
-     * Waits for pending operations to completed.
-     */
-    void waitForCookieOperationsToComplete() {
-        // Note that this function is applicable for both the java
-        // and native http stacks, and works correctly with either.
-        synchronized (this) {
-            while (mPendingCookieOperations > 0) {
-                try {
-                    wait();
-                } catch (InterruptedException e) { }
-            }
-        }
-    }
-
-    private synchronized void signalCookieOperationsComplete() {
-        mPendingCookieOperations--;
-        assert mPendingCookieOperations > -1;
-        notify();
-    }
-
-    private synchronized void signalCookieOperationsStart() {
-        mPendingCookieOperations++;
+        throw new MustOverrideException();
     }
 
     /**
      * Removes all session cookies, which are cookies without an expiration
      * date.
      */
     public void removeSessionCookie() {
-        signalCookieOperationsStart();
-        new AsyncTask<Void, Void, Void>() {
-            protected Void doInBackground(Void... none) {
-                nativeRemoveSessionCookie();
-                signalCookieOperationsComplete();
-                return null;
-            }
-        }.execute();
+        throw new MustOverrideException();
     }
 
     /**
      * Removes all cookies.
      */
     public void removeAllCookie() {
-        nativeRemoveAllCookie();
+        throw new MustOverrideException();
     }
 
     /**
      * Gets whether there are stored cookies.
      * @return True if there are stored cookies.
      */
     public synchronized boolean hasCookies() {
-        return hasCookies(false);
+        throw new MustOverrideException();
     }
 
     /**
-     * See {@link hasCookies()}.
+     * See {@link #hasCookies()}.
      * @param privateBrowsing Whether to use the private browsing cookie jar
      * @hide Used by Browser, no intention to publish.
      */
     public synchronized boolean hasCookies(boolean privateBrowsing) {
-        return nativeHasCookies(privateBrowsing);
+        throw new MustOverrideException();
     }
 
     /**
      * Removes all expired cookies.
      */
     public void removeExpiredCookie() {
-        nativeRemoveExpiredCookie();
+        throw new MustOverrideException();
     }
 
     /**
-     * Package level api, called from CookieSyncManager
-     *
      * Flush all cookies managed by the Chrome HTTP stack to flash.
+     *
+     * @hide Package level api, called from CookieSyncManager
      */
-    void flushCookieStore() {
-        nativeFlushCookieStore();
+    protected void flushCookieStore() {
+        throw new MustOverrideException();
     }
 
     /**
@@ -236,7 +167,7 @@ void flushCookieStore() {
      *         file scheme URLs
      */
     public static boolean allowFileSchemeCookies() {
-        return nativeAcceptFileSchemeCookies();
+        throw new MustOverrideException();
     }
 
     /**
@@ -250,19 +181,6 @@ public static boolean allowFileSchemeCookies() {
      * {@link WebView} or CookieManager instance has been created.
      */
     public static void setAcceptFileSchemeCookies(boolean accept) {
-        nativeSetAcceptFileSchemeCookies(accept);
+        throw new MustOverrideException();
     }
-
-    // Native functions
-    private static native boolean nativeAcceptCookie();
-    private static native String nativeGetCookie(String url, boolean privateBrowsing);
-    private static native boolean nativeHasCookies(boolean privateBrowsing);
-    private static native void nativeRemoveAllCookie();
-    private static native void nativeRemoveExpiredCookie();
-    private static native void nativeRemoveSessionCookie();
-    private static native void nativeSetAcceptCookie(boolean accept);
-    private static native void nativeSetCookie(String url, String value, boolean privateBrowsing);
-    private static native void nativeFlushCookieStore();
-    private static native boolean nativeAcceptFileSchemeCookies();
-    private static native void nativeSetAcceptFileSchemeCookies(boolean accept);
 }