Revert "[Perf] Replace the dimension gpu with synthetic_product_name for win-10-perf"

This reverts commit a02a2de2.

Reason for revert: crbug.com/971204. speculative revert.

Bug: 971204

Original change's description:
> [Perf] Replace the dimension gpu with synthetic_product_name for win-10-perf
> 
> As a followup, the dimension "os" need to be updated once crbug.com/966238 is done
> 
> Bug: 966616
> Change-Id: Ic2da344c93b7f5b656a5002f514cb88a96262659
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637603
> Reviewed-by: Simon Hatch <simonhatch@chromium.org>
> Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
> Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#665719}

TBR=simonhatch@chromium.org,crouleau@chromium.org,jbudorick@chromium.org,hypan@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 966616
Change-Id: I6a3d325b39a6ebad091d35140ae67757481bfdf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645382Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666400}

testing/buildbot/chromium.perf.json

@@ -1970,9 +1970,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,
@@ -2007,9 +2007,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,
@@ -2044,9 +2044,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,
@@ -2081,9 +2081,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,
@@ -2118,9 +2118,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,
@@ -2159,9 +2159,9 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "gpu": "8086:5912",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf",
-              "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
+              "pool": "chrome.tests.perf"
             }
           ],
           "expiration": 7200,

tools/perf/core/perf_data_generator.py

@@ -135,11 +135,6 @@ FYI_BUILDERS = {
 # build/scripts/slave/recipe_modules/chromium_tests and must be kept in sync
 # to generate the correct json for each tester
 #
-# The dimensions in pinpoint configs, excluding the dimension "pool",
-# must be kept in sync with the dimensions here.
-# This is to make sure the same type of machines are used between waterfall
-# tests and pinpoint jobs
-#
 # On desktop builders, chromedriver is added as an additional compile target.
 # The perf waterfall builds this target for each commit, and the resulting
 # ChromeDriver is archived together with Chrome for use in bisecting.
@@ -477,10 +472,8 @@ BUILDERS = {
     'target_bits': 64,
     'dimension': {
       'pool': 'chrome.tests.perf',
-      # TODO Add more specific windows version.
-      # See crbug.com/966238 for more detail
       'os': 'Windows-10',
-      'synthetic_product_name': 'OptiPlex 7050 (Dell Inc.)'
+      'gpu': '8086:5912'
     },
   },
   'Win 7 Perf': {

tools/perf/core/perf_json_config_validator.py

@@ -11,8 +11,7 @@ from core import bot_platforms
 
 _VALID_SWARMING_DIMENSIONS = {
     'gpu', 'device_ids', 'os', 'pool', 'perf_tests', 'perf_tests_with_args',
-    'device_os', 'device_type', 'device_os_flavor', 'id',
-    'synthetic_product_name'}
+    'device_os', 'device_type', 'device_os_flavor', 'id'}
 _DEFAULT_VALID_PERF_POOLS = {
     'chrome.tests.perf', 'chrome.tests.perf-webview',
     'chrome.tests.perf-fyi', 'chrome.tests.perf-webview-fyi'}