From 7e73ce90d6fc6125a0e2f1bb65495efa1816bb1b Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 20 Jan 2011 11:21:24 +0000
Subject: [PATCH] DRT needs to clear cookies between tests.

Fixes failure seen in fast/cookies/local-file-can-set-cookies.html

Change-Id: I08b8a0fcf87003fa4621dce08604bf42e70e4635
---
 .../src/com/android/dumprendertree/TestShellActivity.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index a3466e27e5976..9c4fa975bec04 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -37,6 +37,7 @@ import android.util.Log;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.webkit.ConsoleMessage;
+import android.webkit.CookieManager;
 import android.webkit.GeolocationPermissions;
 import android.webkit.HttpAuthHandler;
 import android.webkit.JsPromptResult;
@@ -827,6 +828,7 @@ public class TestShellActivity extends Activity implements LayoutTestController
         setDefaultWebSettings(mWebView);
         mIsGeolocationPermissionSet = false;
         mPendingGeolocationPermissionCallbacks = null;
+        CookieManager.getInstance().removeAllCookie();
     }
 
     private long[] getDrawWebViewTime(WebView view, int count) {