Disable ContentViewZoomTest#testZoomControls

This test is flaky. See bug for details.

BUG=153522
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/14786009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197721 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java

@@ -13,6 +13,7 @@
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.ContentViewCore;
@@ -220,8 +221,12 @@ public void testZoomUsingMultiTouch() throws Throwable {
         assertFalse(isMultiTouchZoomSupportedOnUiThread());
     }
 
+    /*
     @SmallTest
     @Feature({"AndroidWebView"})
+    This test is flaky. See crbug.com/153522.
+    */
+    @DisabledTest
     public void testZoomControls() throws Throwable {
         AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),