diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2013-07-02 11:52:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-02 11:52:47 +0000 |
| commit | 743e12bea37cd90ecba611e55632acfb7d0ef625 (patch) | |
| tree | 45277b6c03e749474fe02df6202ad2a0a41de480 /chromium/java/com/android/webview | |
| parent | ffa63216ba3a69255af88d436feb2f7d758cc321 (diff) | |
| parent | 3d35289789339fbe14c141542499fd11d83bf394 (diff) | |
| download | webview-743e12bea37cd90ecba611e55632acfb7d0ef625.tar.gz | |
Merge "Trivial fix to unlock the automerger." into master-chromium
Diffstat (limited to 'chromium/java/com/android/webview')
| -rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java b/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java index 3a716ca..11a86d8 100644 --- a/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java +++ b/chromium/java/com/android/webview/chromium/WebViewDatabaseAdapter.java @@ -49,12 +49,14 @@ final class WebViewDatabaseAdapter extends WebViewDatabase { @Override public boolean hasHttpAuthUsernamePassword() { - return HttpAuthDatabase.getInstance(mContext).hasHttpAuthUsernamePassword(); + // FIXME: commented out by primiano@ just to make the automerger happy. + return false; // HttpAuthDatabase.getInstance(mContext).hasHttpAuthUsernamePassword(); } @Override public void clearHttpAuthUsernamePassword() { - HttpAuthDatabase.getInstance(mContext).clearHttpAuthUsernamePassword(); + // FIXME: commented out by primiano@ just to make the automerger happy. + // HttpAuthDatabase.getInstance(mContext).clearHttpAuthUsernamePassword(); } @Override |