aw: Run instrumentation tests in hardware mode

Mark individual tests with hardware acceleration disabled so
the overall suite is still green.

* testZoomControlsOnOrientationChange can't run in hardware
  mode due to too difficult to emulate functor during
  rotation
* All video tests are in software mode. They have value
  being in software mode and should add hardware ones later.
* testCreateAndGcManyTimes, testGetVideoLoadingProgressView
  are flaky in hardware.

BUG=416981

Review URL: https://codereview.chromium.org/554743002

Cr-Commit-Position: refs/heads/master@{#298103}

6 files changed, 8 insertions, 2 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
index 25b1b03..206ed27 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
@@ -46,6 +46,7 @@ public class AwContentsClientGetVideoLoadingProgressViewTest extends AwTestBase
     }
 
 
+    @DisableHardwareAccelerationForTest
     @Feature({"AndroidWebView"})
     @SmallTest
     public void testGetVideoLoadingProgressView() throws Throwable {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index e81a556..3ff100f 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -139,6 +139,7 @@ public class AwContentsTest extends AwTestBase {
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU));
     }
 
+    @DisableHardwareAccelerationForTest
     @LargeTest
     @Feature({"AndroidWebView"})
     public void testCreateAndGcManyTimes() throws Throwable {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 016f9ce..990d9d1 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -2695,6 +2695,7 @@ public class AwSettingsTest extends AwTestBase {
     }
 
     /*
+    @DisableHardwareAccelerationForTest
     @LargeTest
     @Feature({"AndroidWebView", "Preferences"})
     http://crbug.com/304549
@@ -2704,6 +2705,7 @@ public class AwSettingsTest extends AwTestBase {
         assertTrue(VideoTestUtil.runVideoTest(this, false, WAIT_TIMEOUT_MS));
     }
 
+    @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
     public void testMediaPlaybackWithUserGesture() throws Throwable {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index bf72e00..c328392 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -332,9 +332,8 @@ public class AwTestBase
             final AwContentsClient awContentsClient, boolean supportsLegacyQuirks) {
         final TestDependencyFactory testDependencyFactory = createTestDependencyFactory();
 
-        boolean allowHardwareAcceleration = testMethodHasAnnotation(
+        boolean allowHardwareAcceleration = !testMethodHasAnnotation(
                 DisableHardwareAccelerationForTest.class);
-        allowHardwareAcceleration = false;  // TODO(boliu): Turn on hardware acceleration.
         final AwTestContainerView testContainerView =
                 testDependencyFactory.createAwTestContainerView(getActivity(),
                         allowHardwareAcceleration);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
index 50129bd..97ce5b1 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
@@ -268,6 +268,7 @@ public class AwZoomTest extends AwTestBase {
         assertEquals(View.GONE, getVisibilityOnUiThread(zoomControls));
     }
 
+    @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testZoomControlsOnOrientationChange() throws Throwable {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
index b16d860..656942a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
@@ -97,6 +97,7 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
         });
     }
 
+    @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testEnableVideoOverlayForEmbeddedVideo() throws Throwable {
@@ -114,6 +115,7 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
                                  onPositionChangedCallCount, 150.0f, 150.0f);
     }
 
+    @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testDisableVideoOverlayForEmbeddedVideo() throws Throwable {