Revert "Re-enable DirectComposition tests for HD630"

This reverts commit 4ca48383.

Reason for revert: Failing on  Win10 FYI x64 Exp Release (Intel HD 630). See crbug.com/1131041

Original change's description:
> Re-enable DirectComposition tests for HD630
> 
> Unsuppress the DirectComposition info_collection_test and
> trace_test for HD630(0x5912).
> 
> Bug: 1079393
> Change-Id: I6cdd7c146c69b7154dde27b10e9b18b5f989950a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413291
> Commit-Queue: Jie A Chen <jie.a.chen@intel.com>
> Reviewed-by: Zhenyao Mo <zmo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#809210}

TBR=zmo@chromium.org,jie.a.chen@intel.com

Change-Id: If6c2335d318581573da583c038feda89ef575960
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1079393
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424526Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809387}

content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt

 # tags: [ win ]
-# tags: [ intel-0x3e92 ]
+# tags: [ intel-0x3e92 intel-0x5912 ]
 # results: [ Failure ]
 
 # Incorrectly reporting SCALING instead of DIRECT on Win10 w/ UHD 630 GPUs.
 crbug.com/1079393 [ win intel-0x3e92 ] InfoCollection_direct_composition [ Failure ]
+
+# Incorrectly reporting SOFTWARE instead of SCALING for nv12_overlay_support on
+# Win10 w/ HD 630 GPUs and driver 26.20.100.8141
+crbug.com/1079393 [ win intel-0x5912 ] InfoCollection_direct_composition [ Failure ]

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

@@ -92,6 +92,21 @@ crbug.com/1079393 [ win10 intel-0x3e92 ] VideoPathTraceTest_DirectComposition_Un
 crbug.com/1079393 [ win10 intel-0x3e92 ] VideoPathTraceTest_DirectComposition_Video_MP4_Fullsize [ Failure ]
 crbug.com/1079393 [ win10 intel-0x3e92 ] VideoPathTraceTest_DirectComposition_Video_MP4_YUY2 [ Failure ]
 
+# Using YUY2 instead of NV12 on Windows 10 HD 630 GPUs due to NV12 support
+# showing up as SOFTWARE.
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay_DXVA [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay_Fullsize [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_DXVA [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Aspect_4x3 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_180 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_270 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_90 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_Fullsize [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9 [ Failure ]
+crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_DXVA [ Failure ]
+
 # Fuchsia Flakes.
 crbug.com/1058255 [ fuchsia ] TraceTest_WebGLGreenTriangle_AA_Alpha [ Skip ]
 

gpu/config/gpu_driver_bug_list.json

@@ -3552,15 +3552,10 @@
         "type": "win"
       },
       "vendor_id": "0x8086",
-      "driver_version": {
-        "op": ">",
-        "value": "26.20.100.7870"
-      },
-      "device_id": ["0x5902", "0x5906", "0x5908", "0x590a", "0x590b", "0x590e",
-                    "0x5912", "0x5913", "0x5915", "0x5916", "0x5917", "0x591a",
-                    "0x591b", "0x591d", "0x591e", "0x5921", "0x5923", "0x5926",
-                    "0x5927", "0x592a", "0x592b", "0x5932", "0x593a", "0x593b",
-                    "0x593d"],
+      "device_id": ["0x5906", "0x5913", "0x5916", "0x5921", "0x5926", "0x590e",
+                    "0x5915", "0x591e", "0x5902", "0x5917", "0x590b", "0x5908",
+                    "0x591b", "0x593b", "0x590a", "0x591a", "0x591d", "0x5923",
+                    "0x5927", "0x5932", "0x592b", "0x592a", "0x593a", "0x593d"],
       "features": [
         "force_nv12_overlay_support"
       ]