Revert "Reland "Switch GPU tests to Python 3""

This reverts commit 9d365ac.

Reason for revert: Suspected of causing flaky timeouts on
ChromeOS crbug.com/1269853.

Original change's description:
> Reland "Switch GPU tests to Python 3"
>
> This is a reland of 7335d22
>
> Changes from original CL:
> None, but trace_test timeout issues should be fixed by
> crrev.com/c/3273676.
>
> Original change's description:
> > Switch GPU tests to Python 3
> >
> > Switches GPU tools and Telemetry-based tests to run exclusively under
> > Python 3. This applies both locally (via shebang changes) and on the
> > bots (via gn_isolate_map.pyl changes).
> >
> > Also drive-by fixes a couple of minor issues found while ensuring that
> > everything still works as expected.
> >
> > As a side effect, this should fix the issues we're seeing on ARM-based
> > Mac devices with Quartz import errors.
> >
> > Bug: 1198237, 1266604
> > Change-Id: Id2e2bdc8bb3f0ce2877a2fc2398909e3d1e5684a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3245274
> > Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
> > Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> > Commit-Queue: Dirk Pranke <dpranke@google.com>
> > Reviewed-by: Dirk Pranke <dpranke@google.com>
> > Reviewed-by: Kenneth Russell <kbr@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#938540}
>
> Bug: 1198237, 1266604, 1267210
> Change-Id: I018a01ebca66621cf7e904b09ca062216bf45143
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3265234
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#941022}

TBR=dpranke@google.com,kbr@chromium.org,bsheedy@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I5d313fc7603600d7f783199ee38614ec4269d74a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1198237, 1266604, 1267210, 1269853
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279569
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: anthonyvd <anthonyvd@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Owners-Override: anthonyvd <anthonyvd@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/main@{#941316}

.vpython3

@@ -373,9 +373,6 @@ wheel: <
   match_tag: <
     platform: "macosx_10_10_intel"
   >
-  match_tag: <
-    platform: "macosx_11_0_arm64"
-  >
 >
 
 # Used by:

content/test/gpu/PRESUBMIT.py

@@ -48,9 +48,7 @@ def CommonChecks(input_api, output_api):
           output_api,
           input_api.os_path.join(input_api.PresubmitLocalPath(),
                                  'unexpected_passes'), [r'^.+_unittest\.py$'],
-          env=gpu_env,
-          run_on_python2=False,
-          run_on_python3=True))
+          env=gpu_env))
 
   results.extend(
       input_api.canned_checks.RunUnitTestsInDirectory(
@@ -59,8 +57,7 @@ def CommonChecks(input_api, output_api):
           input_api.os_path.join(input_api.PresubmitLocalPath(),
                                  'flake_suppressor'), [r'^.+_unittest\.py$'],
           env=gpu_env,
-          run_on_python2=False,
-          run_on_python3=True))
+          run_on_python2=False))
 
   pylint_checks = input_api.canned_checks.GetPylint(input_api, output_api)
   results.extend(input_api.RunTests(pylint_checks))

content/test/gpu/determine_gold_inexact_parameters.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2020 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.

content/test/gpu/find_unknown_typ_tags.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2021 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.

content/test/gpu/gold_inexact_matching/base_parameter_optimizer.py

@@ -251,7 +251,7 @@ def _DownloadData(self):
                             sort_keys=True,
                             separators=(',', ':'))
       md5 = hashlib.md5()
-      md5.update(json_str.encode('utf-8'))
+      md5.update(json_str)
       self._DownloadExpectations('%s/json/v1/positivedigestsbygrouping/%s' %
                                  (self._gold_url, md5.hexdigest()))
       self._DownloadImagesForTraceGrouping()

content/test/gpu/run_gpu_integration_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2016 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.

content/test/gpu/run_telemetry_benchmark_fuchsia.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2021 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.

content/test/gpu/trim_culprit_cls.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2020 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.

content/test/gpu/unexpected_pass_finder.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2020 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.

content/test/gpu/validate_tag_consistency.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython3
+#!/usr/bin/env vpython
 # Copyright 2020 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.

testing/buildbot/gn_isolate_map.pyl

@@ -1690,7 +1690,6 @@
     "label": "//chrome/test:telemetry_gpu_integration_test",
     "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
     "type": "script",
-    "python3": True,
   },
   "telemetry_gpu_integration_test_android_chrome": {
     "args": [
@@ -1699,7 +1698,6 @@
     "label": "//chrome/test:telemetry_gpu_integration_test_android_chrome",
     "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
     "type": "script",
-    "python3": True,
   },
   "telemetry_gpu_integration_test_android_webview": {
     "args": [
@@ -1708,7 +1706,6 @@
     "label": "//chrome/test:telemetry_gpu_integration_test_android_webview",
     "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
     "type": "script",
-    "python3": True,
   },
   "telemetry_gpu_integration_test_scripts_only": {
     "label": "//chrome/test:telemetry_gpu_integration_test_scripts_only",