Update presubmit gpu tests.

This is a precursor to deleting tools/telemetry so we don't break the gpu tests
presubmit when that lands.

BUG=478864

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

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

content/test/gpu/PRESUBMIT.py

@@ -13,7 +13,10 @@ def _GetPathsToPrepend(input_api):
   return [
     input_api.os_path.join(current_dir, 'gpu_tests'),
     input_api.os_path.join(chromium_src_dir, 'tools', 'perf'),
-    input_api.os_path.join(chromium_src_dir, 'tools', 'telemetry'),
+    input_api.os_path.join(chromium_src_dir,
+        'third_party', 'catapult', 'telemetry'),
+    input_api.os_path.join(chromium_src_dir,
+        'third_party', 'catapult', 'catapult_base'),
   ]
 
 def _WebGLTextExpectationsTests(input_api, output_api):

content/test/gpu/gpu_tests/cloud_storage_test_base.py

@@ -9,7 +9,7 @@ import os
 import re
 import tempfile
 
-from catapult_base import cloud_storage  # pylint: disable=import-error
+from catapult_base import cloud_storage
 from telemetry.page import page_test
 from telemetry.util import image_util
 from telemetry.util import rgba_color

content/test/gpu/gpu_tests/pixel.py

@@ -10,7 +10,7 @@ from gpu_tests import cloud_storage_test_base
 from gpu_tests import pixel_expectations
 import page_sets
 
-from catapult_base import cloud_storage  # pylint: disable=import-error
+from catapult_base import cloud_storage
 from telemetry.page import page_test
 from telemetry.util import image_util
 

content/test/gpu/page_sets/PRESUBMIT.py

@@ -19,7 +19,7 @@ def LoadSupport(input_api):
           _GetChromiumSrcDir(input_api), 'third_party', 'catapult',
           'catapult_base')
       sys.path = [catapult_base_path] + sys.path
-      from catapult_base import cloud_storage  # pylint: disable=import-error
+      from catapult_base import cloud_storage
       globals()['cloud_storage'] = cloud_storage
     finally:
       sys.path = _old_sys_path