[telemetry] Move contents of tools/telemetry_tools to tools/telemetry/util/

- Remove bootstrap code from run_measurement.
- Move all bootstrap_deps files to the top-level directory of their packages, where they should be!
- Indent bootstrap_deps according to the Google Python style guide.


BUG=None.
TEST=tools/perf/run_measurement --print-bootstrap-deps-cros  # Output doesn't change with this patch

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253795 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 9 deletions

diff --git a/tools/cros/bootstrap_deps b/tools/cros/bootstrap_deps
index ae8169d..24f190f 100644
--- a/tools/cros/bootstrap_deps
+++ b/tools/cros/bootstrap_deps
@@ -8,14 +8,14 @@
 # Chrome checkout.
 
 deps = {
-  "src/tools/cros/":
-    "https://src.chromium.org/chrome/trunk/src/tools/cros/",
-  }
+    "src/tools/cros/":
+        "https://src.chromium.org/chrome/trunk/src/tools/cros/",
+}
 
-# both gpu_tests and perf will pull in telemetry.
+# Both contest/test/gpu and tools/perf will pull in telemetry.
 deps_includes = {
-  "src/content/test/gpu/gpu_tests/bootstrap_deps":
-      "https://src.chromium.org/chrome/trunk/src/content/test/gpu/gpu_tests/bootstrap_deps",
-  "src/tools/perf/bootstrap_deps":
-      "https://src.chromium.org/chrome/trunk/src/tools/perf/bootstrap_deps",
-  }
+    "src/content/test/gpu/bootstrap_deps":
+        "https://src.chromium.org/chrome/trunk/src/content/test/gpu/bootstrap_deps",
+    "src/tools/perf/bootstrap_deps":
+        "https://src.chromium.org/chrome/trunk/src/tools/perf/bootstrap_deps",
+}