Revert of Run dEQP ES3 tests on Windows AMD bots. (patchset #2 id:20001 of...

Revert of Run dEQP ES3 tests on Windows AMD bots. (patchset #2 id:20001 of https://codereview.chromium.org/2510153002/ )

Reason for revert:
Looks like the generated json didn't get updated properly.

Original issue's description:
> Run dEQP ES3 tests on Windows AMD bots.
>
> It's important for ANGLE to be able to test both NVIDIA and AMD (our
> Windows WebGL 2 conformance targets) standalone with dEQP
> for correctness on ANGLE rolls and ANGLE try bots. This change will
> add the dEQP-GLES3 tests with ANGLE to the Windows AMD GPU.FYI bots,
> and the ANGLE CQ. The Optional tester is not included for now.
>
> BUG=641080
> R=kbr@chromium.org
> CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
> NOTRY=true
>
> Committed: https://crrev.com/597826c59589969bc904e9287adcf2bc9cdcfccf
> Cr-Commit-Position: refs/heads/master@{#437354}

TBR=kbr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=641080

Review-Url: https://codereview.chromium.org/2567793002
Cr-Commit-Position: refs/heads/master@{#437618}

content/test/gpu/generate_buildbot_json.py

@@ -765,12 +765,10 @@ COMMON_GTESTS = {
         # added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
-          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
-          # AMD Win 7
           {
             'gpu': '1002:6613',
             'os': 'Windows-2008ServerR2-SP1'
@@ -798,7 +796,6 @@ COMMON_GTESTS = {
         # trybots) for the time being, at least until more capacity is added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
-          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'
@@ -826,7 +823,6 @@ COMMON_GTESTS = {
         # Run on Nexus 5X swarmed bots.
         'build_configs': ['android-chromium'],
         'swarming_dimension_sets': [
-          # Nexus 5X
           {
             'device_type': 'bullhead',
             'device_os': 'M',
@@ -850,21 +846,16 @@ COMMON_GTESTS = {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on ANGLE roll tryservers.
+        # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
-        # Run only on the NVIDIA and AMD Win7 bots (and trybots) for the time
-        # being, at least until more capacity is added.
+        # Run only on the Win7 Release NVIDIA 32-bit bots (and trybots) for the
+        # time being, at least until more capacity is added.
+        # TODO(jmadill): Run on the Win AMD R7 240 bots once they are swarmed.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
-          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
-          },
-          # AMD Win 7
-          {
-            'gpu': '1002:6613',
-            'os': 'Windows-2008ServerR2-SP1'
           }
         ],
       }
@@ -883,13 +874,12 @@ COMMON_GTESTS = {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on ANGLE roll tryservers.
+        # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
         # Run only on the Linux Release NVIDIA 32-bit bots (and trybots) for
         # the time being, at least until more capacity is added.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
-          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'