Re-enable test since bug is fixed already

Re-enable testZoomControlsOnNonZoomableContent

Underlying bug is already fixed.

BUG=160861
Android java test change. Ran through android trybot
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171029

[joth, 2012-12-04 18:54:40]

lgtm


On 4 December 2012 10:50, <boliu@chromium.org> wrote:

> Reviewers: klundberg, joth,
>
> Description:
> Re-enable test since bug is fixed already
>
>
> BUG=
>
>
> Please review this at
https://codereview.chromium.**org/11299337/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M android_webview/javatests/src/**org/chromium/android_webview/**
> test/ContentViewZoomTest.java
>
>
> Index: android_webview/javatests/src/**org/chromium/android_webview/**
> test/ContentViewZoomTest.java
> 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 9e3c26fb7019581d68389aabc6314b**870f65869f..**
> b9bfd5beb6fa6f2427a24b9857a742**5e85143457 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 testZoomControlsOnNonZoomableC**ontent() throws
> Throwable {
>          ContentSettings webSettings = getContentSettingsOnUiThread(**
> mAwContents);
>          loadDataSync(mAwContents, mContentsClient.**
> getOnPageFinishedHelper(),
>
>
>

[klundberg, 2012-12-04 19:07:59]

lgtm

[commit-bot: I haz the power, 2012-12-04 19:51:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/boliu@chromium.org/11299337/1

[commit-bot: I haz the power, 2012-12-04 19:52:56]

Change committed as 171029