Replace merge-ui-and-compositor-threads flag with no-merge-ui-and-compositor-threads flag

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.view.ViewConfiguration;
 
 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.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.concurrent.Callable;
 
 /**
  * A test suite for zooming-related methods and settings.
  */
 public class AwZoomTest extends AwTestBase {
@@ skipping 160 matching lines @@
             assertTrue(zoomInOnUiThreadAndWait());
         }
         assertTrue("Should be able to zoom out", canZoomOutOnUiThread());
 
         while (canZoomOutOnUiThread()) {
             assertTrue(zoomOutOnUiThreadAndWait());
         }
         assertTrue("Should be able to zoom in", canZoomInOnUiThread());
     }
 
+    /*
     @SmallTest
     @Feature({"AndroidWebView"})
+    http://crbug.com/239144
+    */
+    @DisabledTest
     public void testMagnification() throws Throwable {
         runMagnificationTest(true);
     }
 
     // According to Android CTS test, zoomIn/Out must work
     // even if supportZoom is turned off.
+    /*
     @SmallTest
     @Feature({"AndroidWebView"})
+    http://crbug.com/239144
+    */
+    @DisabledTest
     public void testMagnificationWithZoomSupportOff() throws Throwable {
         runMagnificationTest(false);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testZoomUsingMultiTouch() throws Throwable {
         AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 getZoomableHtml(), "text/html", false);
 
         assertTrue(webSettings.supportZoom());
         assertFalse(webSettings.getBuiltInZoomControls());
         assertFalse(isMultiTouchZoomSupportedOnUiThread());
 
         webSettings.setBuiltInZoomControls(true);
         assertTrue(isMultiTouchZoomSupportedOnUiThread());
 
         webSettings.setSupportZoom(false);
         assertFalse(isMultiTouchZoomSupportedOnUiThread());
     }
 
+    /*
     @SmallTest
     @Feature({"AndroidWebView"})
+    http://crbug.com/239144
+    */
+    @DisabledTest
     public void testZoomControls() throws Throwable {
         AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
         int onScaleChangedCallCount = mContentsClient.getOnScaleChangedHelper().getCallCount();
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 getZoomableHtml(), "text/html", false);
         mContentsClient.getOnScaleChangedHelper().waitForCallback(onScaleChangedCallCount);
         // It must be possible to zoom in (or zoom out) for zoom controls to be shown
         assertTrue("Should be able to zoom in", canZoomInOnUiThread());
 
         assertTrue(webSettings.supportZoom());
@@ skipping 55 matching lines @@
         activity.setRequestedOrientation(orientation);
         invokeZoomPickerOnUiThread();
 
         // We may crash shortly (as the zoom picker has a short delay in it before
         // it tries to register it's BroadcastReceiver), so sleep to verify we don't.
         // The delay is encoded in ZoomButtonsController#ZOOM_CONTROLS_TIMEOUT,
         // if that changes we may need to update this test.
         Thread.sleep(ViewConfiguration.getZoomControlsTimeout());
     }
 }