Update gpu_tests to use cloud_storage from catapult.

content/test/gpu/gpu_tests/__init__.py

 # Copyright (c) 2012 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.
 """A library for Chrome GPU test code."""
 import os
 import sys
 
 def Init():
-  telemetry_path = os.path.join(
-    os.path.dirname(__file__),
-    '..', '..', '..', '..', 'tools', 'telemetry')
-  absolute_telemetry_path = os.path.abspath(telemetry_path)
-  sys.path.append(absolute_telemetry_path)
+  telemetry_path = os.path.abspath(os.path.join(
+    os.path.dirname(__file__), '..', '..', '..', '..', 'tools', 'telemetry'))

[aiolos (Not reviewing), 2016/01/08 21:07:17]

I could add a chromium_src_dir here and use it in both of the paths if you
prefer.

[Ken Russell (switch to Gerrit), 2016/01/08 22:05:56]

Yes, please do that. Thanks.

[aiolos (Not reviewing), 2016/01/08 22:16:12]

Done.

+  if telemetry_path not in sys.path:
+    sys.path.append(telemetry_path)
+
+  catapult_base_path = os.path.abspath(os.path.join(
+    os.path.dirname(__file__), '..', '..', '..', '..', 'third_party',
+    'catapult', 'catapult_base'))
+  if catapult_base_path not in sys.path:
+    sys.path.append(catapult_base_path)
 
 Init()