Fix breakage when blink_perf benchmarks are run without --browser flag

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 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.
 
 import os
 
 from core import path_util
 from core import perf_benchmark
 
 from telemetry import benchmark
@@ skipping 148 matching lines @@
         '--disable-gesture-requirement-for-media-playback',
         # should be used until every build from
         # ToT to Stable switches over to one flag or another. This is to support
         # reference builds.
         # --disable-gesture-requirement-for-media-playback is the old one and
         # can be removed after M60 goes to stable.
         '--enable-experimental-canvas-features',
         # TODO(qinmin): After fixing crbug.com/592017, remove this command line.
         '--reduce-security-for-testing'
     ])
-    if 'content-shell' in options.browser_type:
+
+  def SetOptions(self, options):
+    super(_BlinkPerfMeasurement, self).SetOptions(options)

[nednguyen, 2017/05/10 09:54:47]

The logic of adding "--expose-internals-for-testing" when browser is
content_shell is moved to here to avoid breakage. You can verify this by running
the benchmark with "-v", the log shows '--expose-internals-for-testing' is still
there

[Xianzhu, 2017/05/10 15:48:34]

I see that the blink_gc test suite is using this configuration. I thought if no
one using we should just remove it.

lgtm.

+    if 'content-shell' in options.browser_options.browser_type:
       options.AppendExtraBrowserArgs('--expose-internals-for-testing')
 
   def _ContinueTestRunWithTracing(self, tab):
     tracing_categories = tab.EvaluateJavaScript(
         'testRunner.tracingCategories')
     config = tracing_config.TracingConfig()
     config.enable_chrome_trace = True
     config.chrome_trace_config.category_filter.AddFilterString(
         'blink.console')  # This is always required for js land trace event
     config.chrome_trace_config.category_filter.AddFilterString(
@@ skipping 95 matching lines @@
         continue
       if event.name == 'FrameView::prePaint':
         results.AddValue(
             scalar.ScalarValue(page, 'prePaint', 'ms', event.duration))
       if event.name == 'FrameView::paintTree':
         results.AddValue(
             scalar.ScalarValue(page, 'paint', 'ms', event.duration))
 
 
 class _BlinkPerfBenchmark(perf_benchmark.PerfBenchmark):
+
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.' + cls.tag
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, self.subdir)
     return CreateStorySetFromPath(path, SKIPPED_FILE)
 
@@ skipping 103 matching lines @@
 
 
 @benchmark.Owner(emails=['hayato@chromium.org'])
 class BlinkPerfShadowDOM(_BlinkPerfBenchmark):
   tag = 'shadow_dom'
   subdir = 'ShadowDOM'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/702319
     return possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'