Revert of [perf] Enable non-verbose logging in memory system health benchmarks

tools/perf/benchmarks/system_health.py

 # Copyright 2016 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 re
 
 from core import perf_benchmark
 from telemetry import benchmark
 from telemetry.timeline import tracing_category_filter
 from telemetry.web_perf import timeline_based_measurement
@@ skipping 46 matching lines @@
     return 'system_health.key_mobile_sites'
 
 
 class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   """Chrome Memory System Health Benchmark.
 
   https://goo.gl/Jek2NL.
   """
 
   def SetExtraBrowserOptions(self, options):
-    # TODO(petrcermak): Remove this and switch to log-on-retry
-    # (http://crbug.com/623058).
-    options.logging_verbosity = options.NON_VERBOSE_LOGGING
     options.AppendExtraBrowserArgs([
         # TODO(perezju): Temporary workaround to disable periodic memory dumps.
         # See: http://crbug.com/513692
         '--enable-memory-benchmarking',
     ])
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options(
         tracing_category_filter.TracingCategoryFilter(
             '-*,disabled-by-default-memory-infra'))
@@ skipping 25 matching lines @@
   """Mobile Chrome Memory System Health Benchmark."""
   page_set = page_sets.MobileMemorySystemHealthStorySet
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/612144 (reference on Nexus 5X).
     return possible_browser.platform.GetDeviceTypeName() == 'Desktop' or (
         possible_browser.browser_type == 'reference' and
         possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')
 
-
 @benchmark.Enabled('android-webview')
 class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   """Webview startup time benchmark
 
   Benchmark that measures how long WebView takes to start up
   and load a blank page. Since thie metric only requires the trace
   markers recorded in atrace, Chrome tracing is not enabled for this
   benchmark.
   """
   page_set = page_sets.BlankPageSet
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.SetTimelineBasedMetric('webviewStartupMetric')
     options.config.enable_atrace_trace = True
     options.config.enable_chrome_trace = False
     options.config.atrace_config.app_name = 'org.chromium.webview_shell'
     return options
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
   @classmethod
   def Name(cls):
     return 'system_health.webview_startup'