am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"

diff --cc core/java/android/webkit/BrowserFrame.java
Simple merge

diff --cc core/java/android/webkit/WebView.java
index 9feb513,e493653..6df7820
--- 1/core/java/android/webkit/WebView.java
--- 2/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@@ -590,17 -585,12 +590,16 @@@ public class WebView extends AbsoluteLa
      //-------------------------------------------------------------------------
  
      /**
 -     * Saves the username and password for a particular host in this WebView's
 -     * internal database.
 +     * Sets a username and password pair for the specified host. This data is
 +     * used by the Webview to autocomplete username and password fields in web
 +     * forms. Note that this is unrelated to the credentials used for HTTP
 +     * authentication.
       *
-      * @param host the host that required the credentials. It is recommended that
-      *             the host is given using scheme://hostname format.
+      * @param host the host that required the credentials
       * @param username the username for the given host
       * @param password the password for the given host
 +     * @see WebViewDatabase#clearUsernamePassword
 +     * @see WebViewDatabase#hasUsernamePassword
       */
      public void savePassword(String host, String username, String password) {
          checkThread();

diff --cc core/java/android/webkit/WebViewDatabaseClassic.java
index 5ad4fa5,9b1d4cb..be01028
--- 1/core/java/android/webkit/WebViewDatabaseClassic.java
--- 2/core/java/android/webkit/WebViewDatabaseClassic.java
+++ b/core/java/android/webkit/WebViewDatabaseClassic.java
@@@ -50,10 -50,8 +50,9 @@@ final class WebViewDatabaseClassic exte
      // 10 -> 11 Drop cookies and cache now managed by the chromium stack,
      //          and update the form data table to use the new format
      //          implemented for b/5265606.
-     // 11 -> 12 Add a delimiter between scheme and host when storing passwords
  
      private static WebViewDatabaseClassic sInstance = null;
 +    private static final Object sInstanceLock = new Object();
  
      private static SQLiteDatabase sDatabase = null;