summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 20:57:15 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 20:57:15 +0000
commit0ccc71768ac3ae88c22b844c16cdd38d2158d66c (patch)
treea498cd204e6fd74a245b5971458b8c24bdae4387 /android_webview
parentc27ed31bda792fc9874776b09821afd4e1393ccb (diff)
downloadchromium_src-0ccc71768ac3ae88c22b844c16cdd38d2158d66c.zip
chromium_src-0ccc71768ac3ae88c22b844c16cdd38d2158d66c.tar.gz
chromium_src-0ccc71768ac3ae88c22b844c16cdd38d2158d66c.tar.bz2
Android WebView fix test threading issue in a disabled test
testGetVisitedHistoryCallbackAfterDestroy is a newly added test that was never run due to bug, but the threading is wrong. TBR=mkosiba@chromium.org BUG= Android only change in a disabled test. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12038098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 3c116d1..89e1750 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -330,7 +330,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), "about:blank");
assertNotNull(mContentsClient.mGetVisitedHistoryCallback);
- awContents.destroy();
+ destroyAwContentsOnMainSync(awContents);
mContentsClient.mGetVisitedHistoryCallback.onReceiveValue(new String[] {"abc.def"});
mContentsClient.mGetVisitedHistoryCallback.onReceiveValue(null);
}