diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:52:54 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:52:54 +0000 |
| commit | c6a8ddbfba213630e6008f751c58b1c33d4bffa9 (patch) | |
| tree | 7ebc57cc17a050e7b848a346adba5d13ec190f77 /android_webview/javatests | |
| parent | a50f54cb8117c6235441e838ee802c4c719c26f6 (diff) | |
| download | chromium_src-c6a8ddbfba213630e6008f751c58b1c33d4bffa9.zip chromium_src-c6a8ddbfba213630e6008f751c58b1c33d4bffa9.tar.gz chromium_src-c6a8ddbfba213630e6008f751c58b1c33d4bffa9.tar.bz2 | |
Re-enable testZoomControlsOnNonZoomableContent
Underlying bug is already fixed.
BUG=160861
Android java test change. Ran through android trybot
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11299337
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java index 9e3c26f..b9bfd5b 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java @@ -280,14 +280,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { assertEquals(View.VISIBLE, zoomControls.getVisibility()); } - /* - * @SmallTest - * @Feature({"AndroidWebView"}) - * crbug.com/160861 - * This test relies on <meta name="viewport"> working properly, which is - * broken at the moment. - */ - @DisabledTest + @SmallTest + @Feature({"AndroidWebView"}) public void testZoomControlsOnNonZoomableContent() throws Throwable { ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |