Move cloud_storage to catapult_base.

BUG=498040

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

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

content/test/gpu/gpu_tests/cloud_storage_test_base.py

@@ -9,11 +9,11 @@ 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(

content/test/gpu/gpu_tests/pixel.py

@@ -11,10 +11,10 @@ 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(

content/test/gpu/page_sets/PRESUBMIT.py

@@ -18,7 +18,7 @@ def LoadSupport(input_api):
     try:
       telemetry_path = _GetTelemetryPath(input_api)
       sys.path = [telemetry_path] + sys.path
-      from telemetry.util import cloud_storage
+      from catapult_base import cloud_storage
       globals()['cloud_storage'] = cloud_storage
     finally:
       sys.path = _old_sys_path

tools/perf/PRESUBMIT.py

@@ -31,7 +31,7 @@ def _CommonChecks(input_api, output_api):
 
 def _CheckWprShaFiles(input_api, output_api):
   """Check whether the wpr sha files have matching URLs."""
-  from telemetry.util import cloud_storage
+  from catapult_base import cloud_storage
   results = []
   for affected_file in input_api.AffectedFiles(include_deletes=False):
     filename = affected_file.AbsoluteLocalPath()

tools/telemetry/telemetry/util/cloud_storage_unittest.py → tools/telemetry/catapult_base/cloud_storage_unittest.py

@@ -5,8 +5,8 @@
 import os
 import unittest
 
+from catapult_base import cloud_storage
 from telemetry.unittest_util import system_stub
-from telemetry.util import cloud_storage
 
 
 def _FakeFindGsutil():

tools/telemetry/catapult_base/support_binaries.py

@@ -5,8 +5,8 @@
 import os
 import stat
 
+from catapult_base import cloud_storage
 from telemetry import decorators
-from telemetry.util import cloud_storage
 from telemetry.util import path
 
 

tools/telemetry/telemetry/benchmark.py

@@ -9,6 +9,7 @@ import shutil
 import sys
 import zipfile
 
+from catapult_base import cloud_storage
 from telemetry.core import browser_finder
 from telemetry.core import command_line
 from telemetry.core import util
@@ -19,7 +20,6 @@ from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.page import test_expectations
 from telemetry.results import results_options
-from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter
 from telemetry.web_perf import timeline_based_measurement
 

tools/telemetry/telemetry/core/platform/linux_platform_backend.py

@@ -8,6 +8,7 @@ import platform
 import subprocess
 import sys
 
+from catapult_base import cloud_storage
 from catapult_base import support_binaries
 from telemetry.core.platform import linux_based_platform_backend
 from telemetry.core.platform import platform_backend
@@ -15,7 +16,6 @@ from telemetry.core.platform import posix_platform_backend
 from telemetry.core.platform.power_monitor import msr_power_monitor
 from telemetry.core import util
 from telemetry import decorators
-from telemetry.util import cloud_storage
 
 
 _POSSIBLE_PERFHOST_APPLICATIONS = [

tools/telemetry/telemetry/core/platform/win_platform_backend.py

@@ -17,13 +17,13 @@ import sys
 import time
 import zipfile
 
+from catapult_base import cloud_storage
 from telemetry.core import exceptions
 from telemetry.core.platform import desktop_platform_backend
 from telemetry.core.platform import platform_backend
 from telemetry.core.platform.power_monitor import msr_power_monitor
 from telemetry.core import util
 from telemetry import decorators
-from telemetry.util import cloud_storage
 from telemetry.util import path
 
 try:

tools/telemetry/telemetry/core/video.py

@@ -4,10 +4,10 @@
 
 import subprocess
 
+from catapult_base import cloud_storage
 from telemetry.core import platform
 from telemetry.image_processing import image_util
 from telemetry.image_processing import rgba_color
-from telemetry.util import cloud_storage
 
 HIGHLIGHT_ORANGE_FRAME = rgba_color.WEB_PAGE_TEST_ORANGE
 

tools/telemetry/telemetry/internal/story_runner.py

@@ -8,13 +8,13 @@ import os
 import sys
 import time
 
+from catapult_base import cloud_storage
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.internal.actions import page_action
 from telemetry.page import page_test
 from telemetry.results import results_options
 from telemetry import story
-from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter
 from telemetry.value import failure
 from telemetry.value import skip

tools/telemetry/telemetry/internal/story_runner_unittest.py

@@ -6,9 +6,10 @@ import StringIO
 import sys
 import unittest
 
+from catapult_base import cloud_storage
 from telemetry import benchmark
-from telemetry import decorators
 from telemetry.core import exceptions
+from telemetry import decorators
 from telemetry.internal import story_runner
 from telemetry.page import page as page_module
 from telemetry.page import page_test
@@ -19,7 +20,6 @@ from telemetry.story import shared_state
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import system_stub
 from telemetry import user_story as user_story_module
-from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter as exception_formatter_module
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar

tools/telemetry/telemetry/page/__init__.py

@@ -6,9 +6,9 @@ import logging
 import os
 import urlparse
 
+from catapult_base import cloud_storage
 from telemetry.page import shared_page_state
 from telemetry import user_story
-from telemetry.util import cloud_storage
 from telemetry.util import path
 
 

tools/telemetry/telemetry/results/html_output_formatter.py

@@ -8,11 +8,11 @@ import logging
 import os
 import re
 
-from telemetry import value as value_module
+from catapult_base import cloud_storage
 from telemetry.core import util
 from telemetry.results import chart_json_output_formatter
 from telemetry.results import output_formatter
-from telemetry.util import cloud_storage
+from telemetry import value as value_module
 
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'util')
 import lastchange  # pylint: disable=F0401

tools/telemetry/telemetry/results/page_test_results.py

@@ -10,9 +10,9 @@ import random
 import sys
 import traceback
 
+from catapult_base import cloud_storage
 from telemetry.results import progress_reporter as progress_reporter_module
 from telemetry.results import user_story_run
-from telemetry.util import cloud_storage
 from telemetry import value as value_module
 from telemetry.value import failure
 from telemetry.value import skip

tools/telemetry/telemetry/story/__init__.py

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from catapult_base import cloud_storage
 from telemetry.story.shared_state import SharedState
-from telemetry.story.story_set import StorySet
 from telemetry.story.story_filter import StoryFilter
-from telemetry.util import cloud_storage
+from telemetry.story.story_set import StorySet
 
 
 PUBLIC_BUCKET = cloud_storage.PUBLIC_BUCKET

tools/telemetry/telemetry/util/find_dependencies.py

@@ -11,11 +11,11 @@ import os
 import sys
 import zipfile
 
+from catapult_base import cloud_storage
 from telemetry import benchmark
 from telemetry.core import command_line
 from telemetry.core import discover
 from telemetry.util import bootstrap
-from telemetry.util import cloud_storage
 from telemetry.util import path
 from telemetry.util import path_set
 

tools/telemetry/telemetry/util/find_dependencies_unittest.py

@@ -12,7 +12,7 @@ import tempfile
 import unittest
 import zipfile
 
-from telemetry.util import cloud_storage
+from catapult_base import cloud_storage
 from telemetry.util import find_dependencies
 
 

tools/telemetry/telemetry/value/trace.py

@@ -11,9 +11,9 @@ import StringIO
 import sys
 import tempfile
 
-from telemetry.timeline import trace_data as trace_data_module
+from catapult_base import cloud_storage
 from telemetry.core import util
-from telemetry.util import cloud_storage
+from telemetry.timeline import trace_data as trace_data_module
 from telemetry.util import file_handle
 from telemetry import value as value_module
 

tools/telemetry/telemetry/wpr/archive_info.py

@@ -9,7 +9,7 @@ import re
 import shutil
 import tempfile
 
-from telemetry.util import cloud_storage
+from catapult_base import cloud_storage
 
 
 def AssertValidCloudStorageBucket(bucket):

tools/telemetry/telemetry/wpr/archive_info_unittest.py

@@ -7,9 +7,9 @@ import shutil
 import tempfile
 import unittest
 
+from catapult_base import cloud_storage
 from telemetry.page import page
 from telemetry.unittest_util import system_stub
-from telemetry.util import cloud_storage
 from telemetry.wpr import archive_info