Revert of Use the Chromium-side script to run the PGO benchmarks.

scripts/slave/recipe_modules/pgo/api.py

Index: scripts/slave/recipe_modules/pgo/api.py
diff --git a/scripts/slave/recipe_modules/pgo/api.py b/scripts/slave/recipe_modules/pgo/api.py
index 8ff8de4b3d7e66a5ad1fee3e733c470e1e3ca34e..f938ab1401aec28385f767b7702b56e10f5c91aa 100644
--- a/scripts/slave/recipe_modules/pgo/api.py
+++ b/scripts/slave/recipe_modules/pgo/api.py
@@ -65,16 +65,24 @@
     """
     Run a suite of telemetry benchmarks to generate some profiling data.
     """
-    args = [
-        '--browser-type', self.m.chromium.c.build_config_fs.lower(),
-        '--target-cpu', self.m.chromium.c.gyp_env.GYP_DEFINES['target_arch'],
-        '--build-dir', self.m.chromium.output_dir,
-    ]
-    self.m.python(
-        'Profiling benchmarks.',
-        self.m.path['checkout'].join('build', 'win',
-                                     'run_pgo_profiling_benchmarks.py'),
-        args)
+    for benchmark in _BENCHMARKS_TO_RUN:
+      try:
+        args = [
+            '--checkout-dir', self.m.path['checkout'],
+            '--browser-type', self.m.chromium.c.build_config_fs.lower(),
+            '--target-bits', self.m.chromium.c.TARGET_BITS,
+            '--build-dir', self.m.chromium.output_dir,
+            '--benchmark', benchmark,
+        ]
+        self.m.python(
+          'Telemetry benchmark: %s' % benchmark,
+          self.resource('run_benchmark.py'),
+          args)
+      except self.m.step.StepFailure:
+        # Turn the failures into warning, we shouldn't stop the build for a
+        # benchmark.
+        step_result = self.m.step.active_result
+        step_result.presentation.status = self.m.step.WARNING
 
   def _compile_optimized_image(self, bot_config):
     """