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

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

 // Copyright 2013 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.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.VideoTestWebServer;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TouchCommon;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Test for AwContentClient.GetVideoLoadingProgressView.
  *
@@ skipping 16 matching lines @@
 
     @Override
     public void onViewDetachedFromWindow(View arg0) {
     }
 
     private void waitForViewAttached() throws InterruptedException, TimeoutException {
         mViewAttachedCallbackHelper.waitForCallback(0, 1, 20, TimeUnit.SECONDS);
     }
 
 
-    @Feature({"AndroidWebView"})
-    @SmallTest
+    /**
+     * @Feature({"AndroidWebView"})
+     * @SmallTest
+     *
+     * http://crbug.com/238735
+     */
+    @DisabledTest
     public void testGetVideoLoadingProgressView() throws Throwable {
         TestAwContentsClient contentsClient =
                 new FullScreenVideoTestAwContentsClient(getActivity()) {
             @Override
             protected View getVideoLoadingProgressView() {
                 View view = new View(getInstrumentation().getTargetContext());
                 view.addOnAttachStateChangeListener(
                         AwContentsClientGetVideoLoadingProgressViewTest.this);
                 return view;
             }
         };
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         enableJavaScriptOnUiThread(awContents);
         VideoTestWebServer webServer = new VideoTestWebServer(
                 getInstrumentation().getTargetContext());
         try {
             loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     webServer.getFullScreenVideoTestURL());
             Thread.sleep(5 * 1000);
             TouchCommon touchCommon = new TouchCommon(this);
             touchCommon.singleClickView(testContainerView);
             waitForViewAttached();
         } finally {
             if (webServer != null) webServer.getTestWebServer().shutdown();
         }
     }
 }