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

scripts/slave/recipe_modules/pgo/api.py

 # 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.
 
 from recipe_engine import recipe_api
 
 
 # List of the benchmark that we run during the profiling step.
 #
 # TODO(sebmarchand): Move this into a BenchmarkSuite in telemetry, this way
@@ skipping 47 matching lines @@
         use_goma=False,
         phase=1)
     # Remove the profile files from the previous builds.
     self.m.file.rmwildcard('*.pg[cd]', str(self.m.chromium.output_dir))
     self.m.chromium.compile(name='Compile: Instrumentation phase.')
 
   def _run_pgo_benchmarks(self):
     """
     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):
     """
     Generates the optimized version of the binaries.
     """
     self.m.chromium.set_config(bot_config['chromium_config_optimize'],
                                **bot_config.get('chromium_config_kwargs'))
     self.m.chromium.runhooks(name='Runhooks: Optimization phase.')
     self.m.chromium.run_mb(
         self.m.properties['mastername'],
@@ skipping 24 matching lines @@
 
     # First step: compilation of the instrumented build.
     self._compile_instrumented_image(bot_config)
 
     # Second step: profiling of the instrumented build.
     self._run_pgo_benchmarks()
 
     # Third step: Compilation of the optimized build, this will use the
     #     profile data files produced by the previous step.
     self._compile_optimized_image(bot_config)