diff options
| author | sgurun <sgurun@chromium.org> | 2015-11-24 12:24:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 20:25:48 +0000 |
| commit | c233039775431fb507e02a70725f92d3ebddea36 (patch) | |
| tree | a51d8c2dbd23fb4b581ecdd2f03175aad66e17e2 /android_webview | |
| parent | dbf4b22d7bf917099479b739e71dd12cdabe8296 (diff) | |
| download | chromium_src-c233039775431fb507e02a70725f92d3ebddea36.zip chromium_src-c233039775431fb507e02a70725f92d3ebddea36.tar.gz chromium_src-c233039775431fb507e02a70725f92d3ebddea36.tar.bz2 | |
Trivial cleanup in cookiemanager
BUG=
Review URL: https://codereview.chromium.org/1475443002
Cr-Commit-Position: refs/heads/master@{#361427}
Diffstat (limited to 'android_webview')
3 files changed, 2 insertions, 17 deletions
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/CookieManagerAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/CookieManagerAdapter.java index b0820fe..c8bf9be 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/CookieManagerAdapter.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/CookieManagerAdapter.java @@ -125,7 +125,7 @@ public class CookieManagerAdapter extends CookieManager { @Override public void removeExpiredCookie() { - mChromeCookieManager.removeExpiredCookie(); + mChromeCookieManager.removeExpiredCookies(); } @Override diff --git a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java index b310b3d..a4350db 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java +++ b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java @@ -19,21 +19,6 @@ import org.chromium.base.annotations.JNINamespace; @JNINamespace("android_webview") public final class AwCookieManager { - // TODO(hjd): remove after landing android update to use new calls. - public void removeExpiredCookie() { - removeExpiredCookies(); - } - - // TODO(hjd): remove after landing android update to use new calls. - public void removeAllCookie() { - removeAllCookies(); - } - - // TODO(hjd): remove after landing android update to use new calls. - public void removeSessionCookie() { - removeSessionCookies(); - } - /** * Control whether cookie is enabled or disabled * @param accept TRUE if accept cookie diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java index 2c72619..c17f749 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java @@ -466,7 +466,7 @@ public class CookieManagerTest extends AwTestBase { TestWebServer webServer = TestWebServer.start(); try { mCookieManager.setAcceptCookie(true); - mCookieManager.removeAllCookie(); + mCookieManager.removeAllCookies(); assertTrue(mCookieManager.acceptCookie()); assertFalse(mCookieManager.hasCookies()); |