Move cloud_storage to catapult_base.

content/test/gpu/gpu_tests/cloud_storage_test_base.py

 # Copyright 2013 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.
 
 """Base classes for a test and validator which upload results
 (reference images, error images) to cloud storage."""
 
 import os
 import re
 import tempfile
 
+from catapult_base import cloud_storage
 from telemetry import benchmark
 from telemetry.image_processing import image_util
 from telemetry.image_processing import rgba_color
 from telemetry.page import page_test
-from telemetry.util import cloud_storage
 
 
 test_data_dir = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
 
 default_generated_data_dir = os.path.join(test_data_dir, 'generated')
 
 error_image_cloud_storage_bucket = 'chromium-browser-gpu-tests'
 
 def _CompareScreenshotSamples(screenshot, expectations, device_pixel_ratio):
@@ skipping 225 matching lines @@
         default='')
     group.add_option('--test-machine-name',
         help='Name of the test machine. Specifying this argument causes this '
         'script to upload failure images and diffs to cloud storage directly, '
         'instead of relying on the archive_gpu_pixel_test_results.py script.',
         default='')
     group.add_option('--generated-dir',
         help='Overrides the default on-disk location for generated test images '
         '(only used for local testing without a cloud storage account)',
         default=default_generated_data_dir)