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

tools/perf/benchmarks/blink_perf.py

Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index 7491f125d83ba087a437d5f03185aa58263abe93..413735ee15276aebe24a047741c5e8143a6eb535 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -166,7 +166,10 @@ class _BlinkPerfMeasurement(legacy_page_test.LegacyPageTest):
         # 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):
@@ -282,6 +285,7 @@ class _BlinkPerfPaintMeasurement(_BlinkPerfMeasurement):
 
 
 class _BlinkPerfBenchmark(perf_benchmark.PerfBenchmark):
+
   test = _BlinkPerfMeasurement
 
   @classmethod