summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2012-02-24 00:13:06 +0000
committerJonathan Dixon <joth@google.com>2012-03-02 11:18:30 +0000
commit4d2fcaba7fb8eb1723943ac9a10e76d509330bd1 (patch)
tree19a8905db9aa0aad4a60c1c3ef4fd7506c2089ad /tests
parentf9a4c8405898fa55be50ee4b682f7e97b054a41f (diff)
downloadpackages_apps_browser-4d2fcaba7fb8eb1723943ac9a10e76d509330bd1.zip
packages_apps_browser-4d2fcaba7fb8eb1723943ac9a10e76d509330bd1.tar.gz
packages_apps_browser-4d2fcaba7fb8eb1723943ac9a10e76d509330bd1.tar.bz2
Fixup browser to use WebView proxy
Has to escape out to WebViewClassic whenever it needs a hidden API. Interdepends on https://android-git.corp.google.com/g/165608 Change-Id: Ic61dd7f57f75381864075605d5901f2688648cbd
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/browser/PopularUrlsTest.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java
index cbe8324..566d74b 100644
--- a/tests/src/com/android/browser/PopularUrlsTest.java
+++ b/tests/src/com/android/browser/PopularUrlsTest.java
@@ -32,6 +32,7 @@ import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.SslErrorHandler;
import android.webkit.WebView;
+import android.webkit.WebViewClassic;
import java.io.BufferedReader;
import java.io.File;
@@ -134,7 +135,8 @@ public class PopularUrlsTest extends ActivityInstrumentationTestCase2<BrowserAct
Tab tab = mController.getTabControl().getCurrentTab();
WebView webView = tab.getWebView();
- webView.setWebChromeClient(new TestWebChromeClient(webView.getWebChromeClient()) {
+ webView.setWebChromeClient(new TestWebChromeClient(
+ WebViewClassic.fromWebView(webView).getWebChromeClient()) {
@Override
public void onProgressChanged(WebView view, int newProgress) {
@@ -203,7 +205,8 @@ public class PopularUrlsTest extends ActivityInstrumentationTestCase2<BrowserAct
}
});
- webView.setWebViewClient(new TestWebViewClient(webView.getWebViewClient()) {
+ webView.setWebViewClient(new TestWebViewClient(
+ WebViewClassic.fromWebView(webView).getWebViewClient()) {
/**
* Bypasses and logs errors.