[Telemetry] Specify generate_breakpad_symbols.py using binary manager

BUG=535648

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

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

4 files changed, 24 insertions, 15 deletions

diff --git a/chrome/telemetry_binary_manager.isolate b/chrome/telemetry_binary_manager.isolate
index 11852b6..5aafc2b 100644
--- a/chrome/telemetry_binary_manager.isolate
+++ b/chrome/telemetry_binary_manager.isolate
@@ -7,6 +7,7 @@
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/crash_service<(EXECUTABLE_SUFFIX)',
+          '../components/crash/content/tools/generate_breakpad_symbols.py',
         ],
       },
     }],
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index bf23141..af286d1 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -257,13 +257,14 @@ source_set("test_support_ui") {
 group("telemetry_binary_deps") {
   data_deps = []
 
-  if (is_win) {
-    data_deps += [ "//content/shell:crash_service" ]
-  }
-
   data = [
     "//tools/perf/core/binary_dependencies.json",
   ]
+
+  if (is_win) {
+    data_deps += [ "//content/shell:crash_service" ]
+    data += [ "//components/crash/content/tools/generate_breakpad_symbols.py" ]
+  }
 }
 
 if (!is_android) {
@@ -786,9 +787,7 @@ if (!is_android) {
   # The _run targets exist only for compatibility w/ GYP.
   group("browser_tests_run") {
     testonly = true
-    data_deps = [
-      ":browser_tests",
-    ]
+    data_deps = [ ":browser_tests" ]
   }
 
   test("browser_tests") {
@@ -1337,9 +1336,7 @@ if (!is_android) {
       "//third_party/WebKit/public:blink",
     ]
 
-    data_deps = [
-      "//third_party/mesa:osmesa",
-    ]
+    data_deps = [ "//third_party/mesa:osmesa" ]
 
     if (cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any
diff --git a/tools/perf/core/binary_dependencies.json b/tools/perf/core/binary_dependencies.json
index e0a4b2f..8eabd83 100644
--- a/tools/perf/core/binary_dependencies.json
+++ b/tools/perf/core/binary_dependencies.json
@@ -10,6 +10,15 @@
           ]
         }
       }
+    },
+    "generate_breakpad_symbols": {
+      "file_info": {
+        "win_AMD64": {
+          "local_paths": [
+            "../../../components/crash/content/tools/generate_breakpad_symbols.py"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
index fe58c01..3fd7e3c 100644
--- a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
@@ -438,12 +438,14 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
         return
 
       logging.info('Dumping breakpad symbols.')
-      generate_breakpad_symbols_path = os.path.join(
-          util.GetChromiumSrcDir(), "components", "crash", "content",
-          "tools", "generate_breakpad_symbols.py")
+      generate_breakpad_symbols_command = binary_manager.FetchPath(
+          'generate_breakpad_symbols', arch_name, os_name)
+      if generate_breakpad_symbols_command is None:
+        return
+
       cmd = [
           sys.executable,
-          generate_breakpad_symbols_path,
+          generate_breakpad_symbols_command,
           '--binary=%s' % self._executable,
           '--symbols-dir=%s' % symbols_path,
           '--build-dir=%s' % self._browser_directory,
@@ -453,7 +455,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
         subprocess.check_output(cmd, stderr=open(os.devnull, 'w'))
       except subprocess.CalledProcessError:
         logging.warning('Failed to execute "%s"' % ' '.join(cmd))
-        return None
+        return
 
     return subprocess.check_output([stackwalk, minidump, symbols_path],
                                    stderr=open(os.devnull, 'w'))