Update tools/perf to use cloud_storage from catapult.

tools/perf/fetch_benchmark_deps.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """This module fetches and prints the dependencies given a benchmark."""
 
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'telemetry'))
+
+def _GetPerfDir(*subdirs):
+  perf_dir = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
+  return os.path.join(perf_dir, *subdirs)
+
+
+def GetChromiumDir():
+  return os.path.abspath(_GetPerfDir('..', '..', '..'))
+
+
+telemetry_path = os.path.os.path.join(GetChromiumDir(), 'tools', 'telemetry')
+if telemetry_path not in sys.path:
+  sys.path.insert(1, telemetry_path)
+catapult_base_path = os.path.join(
+    GetChromiumDir(), 'third_party', 'catapult', 'catapult_base')
+if catapult_base_path not in sys.path:
+  sys.path.insert(1, catapult_base_path)
 
 from catapult_base import cloud_storage
 from telemetry import benchmark_runner
 
 
-def _GetPerfDir(*subdirs):
-  perf_dir = os.path.realpath(os.path.dirname(__file__))
-  return os.path.join(perf_dir, *subdirs)
-
-
-def GetChromiumDir():
-  return _GetPerfDir(os.path.pardir, os.path.pardir, os.path.pardir)
-
-
 def _FetchDependenciesIfNeeded(story_set):
   """ Download files needed by a user story set. """
   # Download files in serving_dirs.
   serving_dirs = story_set.serving_dirs
   for directory in serving_dirs:
     cloud_storage.GetFilesInDirectoryIfChanged(directory, story_set.bucket)
 
   # Download WPR files.
   if any(not story.is_local for story in story_set):
     story_set.wpr_archive_info.DownloadArchivesIfNeeded()
@@ skipping 49 matching lines @@
   deps = _EnumerateDependencies(story_set)
   for dep in deps:
     print >> output, dep
 
 
 if __name__ == '__main__':
   if len(sys.argv) != 2 or sys.argv[1][0] == '-':
     _show_usage()
   else:
     main()