Remove deprecated static method.

Remove deprecated getInstance() method from HttpAuthDatabase. Depends
on https://codereview.chromium.org/18051014/.

Change-Id: I984451b102126b861f360af8cb2911e78d124f04

2 files changed, 9 insertions, 9 deletions

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index a5144ac..39b2f0a 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -233,8 +233,10 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         synchronized (mLock) {
             if (mWebViewDatabase == null) {
                 ensureChromiumStartedLocked();
-                mWebViewDatabase = new WebViewDatabaseAdapter(context,
-                        getBrowserContextLocked().getFormDatabase());
+                AwBrowserContext browserContext =  getBrowserContextLocked();
+                mWebViewDatabase = new WebViewDatabaseAdapter(
+                        browserContext.getFormDatabase(),
+                        browserContext.getHttpAuthDatabase(context));
             }
         }
         return mWebViewDatabase;
diff --git a/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java b/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
index 11a86d8..8ec44a3 100644
--- a/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
+++ b/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java
@@ -28,12 +28,12 @@ import org.chromium.android_webview.HttpAuthDatabase;
  */
 final class WebViewDatabaseAdapter extends WebViewDatabase {
 
-    private Context mContext;
     private AwFormDatabase mFormDatabase;
+    private HttpAuthDatabase mHttpAuthDatabase;
 
-    public WebViewDatabaseAdapter(Context context, AwFormDatabase formDatabase) {
-        mContext = context;
+    public WebViewDatabaseAdapter(AwFormDatabase formDatabase, HttpAuthDatabase httpAuthDatabase) {
         mFormDatabase = formDatabase;
+        mHttpAuthDatabase = httpAuthDatabase;
     }
 
     @Override
@@ -49,14 +49,12 @@ final class WebViewDatabaseAdapter extends WebViewDatabase {
 
     @Override
     public boolean hasHttpAuthUsernamePassword() {
-        // FIXME: commented out by primiano@ just to make the automerger happy.
-        return false; // HttpAuthDatabase.getInstance(mContext).hasHttpAuthUsernamePassword();
+        return mHttpAuthDatabase.hasHttpAuthUsernamePassword();
     }
 
     @Override
     public void clearHttpAuthUsernamePassword() {
-        // FIXME: commented out by primiano@ just to make the automerger happy.
-        // HttpAuthDatabase.getInstance(mContext).clearHttpAuthUsernamePassword();
+        mHttpAuthDatabase.clearHttpAuthUsernamePassword();
     }
 
     @Override