Move cloud_storage to catapult_base.

content/test/gpu/gpu_tests/pixel.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.
 from datetime import datetime
 import glob
 import optparse
 import os
 import re
 
 import cloud_storage_test_base
 import page_sets
 import pixel_expectations
 
+from catapult_base import cloud_storage
 from telemetry import benchmark
 from telemetry.image_processing import image_util
 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_reference_image_dir = os.path.join(test_data_dir, 'gpu_reference')
 
 test_harness_script = r"""
   var domAutomationController = {};
 
@@ skipping 134 matching lines @@
         default=default_reference_image_dir)
 
   def CreatePageSet(self, options):
     page_set = page_sets.PixelTestsPageSet()
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set
 
   def CreateExpectations(self):
     return pixel_expectations.PixelExpectations()