commit bbdb9f6d2ef06c1dcf6cf32983f2c7989c61d974
author Brian Muramatsu <btmura@android.com> Fri Oct 29 09:23:24 2010 -0700
committer Android Code Review <code-review@android.com> Fri Oct 29 09:23:24 2010 -0700
tree 4cdbb5297a6935596879b1c32e8372cc1b756db0
parent a138f2bf64094ba646d16d74b725045960f8fd09
parent 08c1a3bb0a090c138d2d3db3399d5ded236b8cc7

Merge "update CookieManagerTest.java" into froyo

tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
old mode 100644
new mode 100755
index fea44ef..ca1b76f
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -26,6 +26,7 @@
 import android.view.animation.cts.DelayedCheck;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
+import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
 import java.util.Date;
@@ -50,6 +51,9 @@
         super.setUp();
         mWebView = getActivity().getWebView();
 
+        // Set a web chrome client in order to receive progress updates.
+        mWebView.setWebChromeClient(new WebChromeClient());
+
         mCookieManager = CookieManager.getInstance();
         assertNotNull(mCookieManager);
     }