[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

2 files changed, 26 insertions, 26 deletions

diff --git a/content/test/gpu/bootstrap_deps b/content/test/gpu/bootstrap_deps
new file mode 100644
index 0000000..ab06006
--- /dev/null
+++ b/content/test/gpu/bootstrap_deps
@@ -0,0 +1,26 @@
+# Copyright 2014 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 file specifies dependencies required to bootstrap perf_tools. It is in a
+# minimal version of the format used by other DEPS files that gclient can read,
+# but it should only be used to bootstrap perf_tools *outside* of a normal
+# Chrome checkout.
+
+deps = {
+    "src/content/test/gpu/gpu_tests":
+        "https://src.chromium.org/chrome/trunk/src/content/test/gpu/gpu_tests",
+    "src/content/test/gpu/page_sets":
+        "https://src.chromium.org/chrome/trunk/src/content/test/gpu/page_sets",
+    # TODO(ihf): Figure out a different way to specify this dependency. This
+    # directory needs to be checked out with the instructions provided by
+    # https://src.chromium.org/chrome/trunk/src/third_party/webgl/README.chromium
+    "src/third_party/webgl/src/sdk/tests":
+        "",
+}
+
+# gpu_tests depends on Telemetry, so pull in the Telemetry deps, too.
+deps_includes = {
+    "src/tools/telemetry/bootstrap_deps":
+        "https://src.chromium.org/chrome/trunk/src/tools/telemetry/bootstrap_deps",
+}
diff --git a/content/test/gpu/gpu_tests/bootstrap_deps b/content/test/gpu/gpu_tests/bootstrap_deps
deleted file mode 100644
index 67c5b70..0000000
--- a/content/test/gpu/gpu_tests/bootstrap_deps
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.
-
-# This file specifies dependencies required to bootstrap perf_tools. It is in a
-# minimal version of the format used by other DEPS files that gclient can read,
-# but it should only be used to bootstrap perf_tools *outside* of a normal
-# Chrome checkout.
-
-deps = {
-  "src/content/test/gpu/gpu_tests":
-    "https://src.chromium.org/chrome/trunk/src/content/test/gpu/gpu_tests",
-  "src/content/test/gpu/page_sets":
-    "https://src.chromium.org/chrome/trunk/src/content/test/gpu/page_sets",
-  # TODO(ihf): Figure out a different way to specify this dependency. This
-  # directory needs to be checked out with the instructions provided by
-  # https://src.chromium.org/chrome/trunk/src/third_party/webgl/README.chromium
-  "src/third_party/webgl/src/sdk/tests":
-    "",
-  }
-
-# gpu_tests depends on Telemetry, so pull in the Telemetry deps, too.
-deps_includes = {
-  "src/tools/telemetry_tools/bootstrap_deps":
-      "https://src.chromium.org/chrome/trunk/src/tools/telemetry_tools/bootstrap_deps",
-  }