Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java

Issue 445553002: Merge 281052 "[android_webview] Add a zoomBy method to AwContents." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
===================================================================
--- android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java (revision 287507)
+++ android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java (working copy)
@@ -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 @@
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(),

Powered by Google App Engine
This is Rietveld 408576698