Revert of Add crash_service to Telemetry's isolates. (patchset #8 id:180001 of https://codereview.chromium.org/1361523003/ )

Reason for revert:
Suspected build fail see https://code.google.com/p/chromium/issues/detail?id=536998 and https://code.google.com/p/chromium/issues/detail?id=537065

Original issue's description:
> Add crash_service to Telemetry's isolates.
>
> Switch to using binary_manager for the crash_service executable,
> eliminating downloads of this binary from cloud storage. (A follow-on
> CL will likely forbid the bots from downloading this and other
> executables from cloud storage entirely, rather than continuing to use
> this as a fallback path.)
>
> Telemetry's isolates are currently specified fairly differently for
> the GYP and GN builds; other CLs underway will unify their
> specification more.
>
> Follow up CL's will be needed to add the client config to gpu's tests.
>
> authors=kbr@,aiolos@
>
> BUG=466877
>
> Committed: https://crrev.com/6bdfb7dfb3ce2e571697629895089cffc42b48e6
> Cr-Commit-Position: refs/heads/master@{#351196}

TBR=phajdan.jr@chromium.org,dpranke@chromium.org,kbr@chromium.org,maruel@chromium.org,piman@chromium.org,aiolos@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=466877

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

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

11 files changed, 24 insertions, 107 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index da582da..5d727d8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3243,11 +3243,6 @@
                     '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_database_util',
                   ],
                 }],
-                ['OS=="win"', {
-                  'dependencies': [
-                    'chrome.gyp:crash_service',
-                  ],
-                }],
               ],
             },
             {
diff --git a/chrome/telemetry_binary_manager.isolate b/chrome/telemetry_binary_manager.isolate
deleted file mode 100644
index 11852b6..0000000
--- a/chrome/telemetry_binary_manager.isolate
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 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.
-{
-  'conditions': [
-    ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/crash_service<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-  'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          # Chromium local path information for Telemetry's binary_manager.
-          '../tools/perf/core/binary_dependencies.json',
-        ],
-      },
-    }],
-  ]
-}
diff --git a/chrome/telemetry_chrome_test.isolate b/chrome/telemetry_chrome_test.isolate
index 50c49a8..a3c9f3a 100644
--- a/chrome/telemetry_chrome_test.isolate
+++ b/chrome/telemetry_chrome_test.isolate
@@ -7,6 +7,6 @@
   'includes': [
     'breakpad.isolate',
     'chrome.isolate',
-    'telemetry.isolate',
+    '../content/telemetry.isolate',
   ],
 }
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 9bad31b..aeaeee4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -230,18 +230,6 @@ source_set("test_support") {
   }
 }
 
-group("telemetry_binary_deps") {
-  data_deps = []
-
-  if (is_win) {
-    data_deps += [ "//content/shell:crash_service" ]
-  }
-
-  data = [
-    "//tools/perf/core/binary_dependencies.json",
-  ]
-}
-
 if (!is_android) {
   import("//third_party/protobuf/proto_library.gni")
 
@@ -623,10 +611,6 @@ if (!is_android) {
   }
 
   group("telemetry_gpu_test") {
-    deps = [
-      "//tools/telemetry:telemetry_test_support",
-      ":telemetry_binary_deps",
-    ]
     data_deps = [
       # TODO(kbr): this used to be "//chrome". Had to change this to
       # chrome_initial temporarily to work around crbug.com/536192.
@@ -645,6 +629,18 @@ if (!is_android) {
       # For webgl_conformance
       "//third_party/webgl/",
       "//content/test/gpu/run_gpu_test.py",
+
+      # Generic telemetry deps
+      # TODO(GYP): These should probably be specified somewhere else
+      # and pulled in via a deps entry.
+      "//build/android/devil/",
+      "//build/android/pylib/",
+      "//build/util/",
+      "//third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js",
+      "//third_party/WebKit/PerformanceTests/resources/statistics.js",
+      "//third_party/flot/jquery.flot.min.js",
+      "//third_party/webpagereplay/",
+      "//tools/telemetry/",
     ]
 
     if (is_win && (symbol_level == 1 || symbol_level == 2)) {
diff --git a/chrome/telemetry.isolate b/content/telemetry.isolate
index b3a2fe9..4679a5e 100644
--- a/chrome/telemetry.isolate
+++ b/content/telemetry.isolate
@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'includes': [
-    'telemetry_binary_manager.isolate',
-  ],
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
diff --git a/chrome/telemetry_gpu_unittests.isolate b/content/telemetry_gpu_unittests.isolate
index 9e70eb3..9e70eb3 100644
--- a/chrome/telemetry_gpu_unittests.isolate
+++ b/content/telemetry_gpu_unittests.isolate
diff --git a/tools/perf/core/binary_dependencies.json b/tools/perf/core/binary_dependencies.json
deleted file mode 100644
index e0a4b2f..0000000
--- a/tools/perf/core/binary_dependencies.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "config_type": "BaseConfig",
-  "dependencies": {
-    "crash_service": {
-      "file_info": {
-        "win_AMD64": {
-          "local_paths": [
-            "../../../out/Debug/crash_service.exe",
-            "../../../out/Release/crash_service.exe"
-          ]
-        }
-      }
-    }
-  }
-}
diff --git a/tools/perf/core/project_config.py b/tools/perf/core/project_config.py
index df488c7..a82bf7e 100644
--- a/tools/perf/core/project_config.py
+++ b/tools/perf/core/project_config.py
@@ -5,21 +5,17 @@
 import os
 import sys
 
-
-THIS_DIR = os.path.dirname(os.path.abspath(__file__))
-TOP_LEVEL_DIR = os.path.normpath(os.path.join(THIS_DIR, os.pardir))
-TELEMETRY_DIR = os.path.normpath(os.path.join(
-    TOP_LEVEL_DIR, os.pardir, 'telemetry'))
-
-sys.path.append(TELEMETRY_DIR)
+sys.path.append(os.path.join(
+    os.path.dirname(__file__), os.pardir, os.pardir, 'telemetry'))
 from telemetry import benchmark_runner
 
-binary_dependencies_file = os.path.join(THIS_DIR, 'binary_dependencies.json')
+top_level_dir = os.path.dirname(os.path.realpath(
+    os.path.join(__file__, os.pardir)))
 
 config = benchmark_runner.ProjectConfig(
-    top_level_dir=TOP_LEVEL_DIR,
-    benchmark_dirs=[os.path.join(TOP_LEVEL_DIR, 'benchmarks')],
-    client_config=binary_dependencies_file)
+    top_level_dir=top_level_dir,
+    benchmark_dirs=[os.path.join(top_level_dir, 'benchmarks')])
 
-config.telemetry_dir = TELEMETRY_DIR
+config.telemetry_dir = os.path.realpath(os.path.join(
+    top_level_dir, os.pardir, 'telemetry'))
 
diff --git a/tools/telemetry/BUILD.gn b/tools/telemetry/BUILD.gn
index a8f9223..9c7e989 100644
--- a/tools/telemetry/BUILD.gn
+++ b/tools/telemetry/BUILD.gn
@@ -2,20 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-group("telemetry_test_support") {
-  # Generic telemetry deps
-  data = [
-    "//build/android/devil/",
-    "//build/android/pylib/",
-    "//build/util/",
-    "//third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js",
-    "//third_party/WebKit/PerformanceTests/resources/statistics.js",
-    "//third_party/flot/jquery.flot.min.js",
-    "//third_party/webpagereplay/",
-    "//tools/telemetry/",
-  ]
-}
-
 executable("bitmaptools") {
   sources = [
     "telemetry/internal/image_processing/bitmaptools.cc",
diff --git a/tools/telemetry/catapult_base/dependency_manager/dependency_manager.py b/tools/telemetry/catapult_base/dependency_manager/dependency_manager.py
index b99af78..29f389f 100644
--- a/tools/telemetry/catapult_base/dependency_manager/dependency_manager.py
+++ b/tools/telemetry/catapult_base/dependency_manager/dependency_manager.py
@@ -216,9 +216,7 @@ class DependencyManager(object):
     if dependency_info:
       paths = dependency_info.local_paths
       for local_path in paths:
-        logging.info('Trying local_path %s', local_path)
         if os.path.exists(local_path):
-          logging.info('local_path %s exists.', local_path)
           return local_path
     return None
 
@@ -267,3 +265,4 @@ class DependencyManager(object):
     os.chmod(download_path,
              stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | stat.S_IRGRP)
     return os.path.abspath(download_path)
+
diff --git a/tools/telemetry/telemetry/internal/binary_dependencies.json b/tools/telemetry/telemetry/internal/binary_dependencies.json
index f24a766..d831016 100644
--- a/tools/telemetry/telemetry/internal/binary_dependencies.json
+++ b/tools/telemetry/telemetry/internal/binary_dependencies.json
@@ -1,15 +1,2 @@
-{
-  "config_type": "BaseConfig",
-  "dependencies": {
-    "crash_service": {
-      "cloud_storage_bucket": "chromium-telemetry",
-      "cloud_storage_base_folder": "binary_dependencies",
-      "file_info": {
-        "win_AMD64": {
-          "cloud_storage_hash": "4a0961e972895f4af3b7cfab959c5bfd4de7174b",
-          "download_path": "../../bin/win/AMD64/crash_service.exe"
-        }
-      }
-    }
-  }
-}
+{"config_type":"BaseConfig",
+ "dependencies":{}}