Merge "update CookieManagerTest.java" into froyo
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);
     }