diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 15:15:53 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 15:15:53 +0000 |
| commit | a17866460a869a02d41840f01c1fb19d48c67820 (patch) | |
| tree | 24f50f75381000f0d68fea5ef24c81c8e222aa74 /android_webview | |
| parent | 059dbad35f930ed115e4c467bc1510eed17d5066 (diff) | |
| download | chromium_src-a17866460a869a02d41840f01c1fb19d48c67820.zip chromium_src-a17866460a869a02d41840f01c1fb19d48c67820.tar.gz chromium_src-a17866460a869a02d41840f01c1fb19d48c67820.tar.bz2 | |
[Android] Upstream TestCallbackHelperContainer.
Make required changes to dependant files.
R=mkosiba@chromium.org,android-webview-reviews@google.com
Review URL: https://codereview.chromium.org/10939017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java | 3 | ||||
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java | 8 |
2 files changed, 6 insertions, 5 deletions
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 c2a5868..8fe95fc 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 @@ -14,7 +14,8 @@ import org.chromium.base.test.Feature; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.Criteria; import org.chromium.content.browser.test.CriteriaHelper; -import org.chromium.content.browser.test.TestContentViewClient.OnEvaluateJavaScriptResultHelper; +import org.chromium.content.browser.test. + TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java index 89a09d7..f63b987 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java @@ -4,10 +4,10 @@ package org.chromium.android_webview.test; -import org.chromium.content.browser.test.TestContentViewClient.OnPageStartedHelper; -import org.chromium.content.browser.test.TestContentViewClient.OnPageFinishedHelper; -import org.chromium.content.browser.test.TestContentViewClient.OnReceivedErrorHelper; -import org.chromium.content.browser.test.TestContentViewClient.OnEvaluateJavaScriptResultHelper; +import org.chromium.content.browser.test.TestCallbackHelperContainer.OnPageStartedHelper; +import org.chromium.content.browser.test.TestCallbackHelperContainer.OnPageFinishedHelper; +import org.chromium.content.browser.test.TestCallbackHelperContainer.OnReceivedErrorHelper; +import org.chromium.content.browser.test.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper; class TestAwContentsClient extends NullContentsClient { private OnPageStartedHelper mOnPageStartedHelper; |