| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
|
| index b634fef8add142252395cdee618a3fa643fc4fd0..fc0a85536cbe276e1f6adf72d3a84883c6999c7d 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
|
| @@ -4,9 +4,10 @@
|
|
|
| package org.chromium.android_webview.test;
|
|
|
| +import android.test.suitebuilder.annotation.SmallTest;
|
| +
|
| import org.chromium.android_webview.AwContents;
|
| import org.chromium.android_webview.test.util.CommonResources;
|
| -import org.chromium.base.test.util.DisabledTest;
|
| import org.chromium.content.browser.ContentViewCore;
|
|
|
| /**
|
| @@ -30,11 +31,7 @@ public class AwContentsClientOnScaleChangedTest extends AwTestBase {
|
| super.tearDown();
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| - This test is timing out on ICS bots including cq. See crbug.com/175854.
|
| - */
|
| - @DisabledTest
|
| public void testScaleUp() throws Throwable {
|
| getAwSettingsOnUiThread(mAwContents).setUseWideViewPort(true);
|
| loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
|
|
|