Allow blink.console or webkit.console in telemetry

This is in preparation of me renaming the "webkit*" category to "blink*"
in the blink codebase. Once that change has rolled into chromium I'll do
another CL for chromium to remove the "webkit.console" entry.

BUG=386847

Review URL: https://codereview.chromium.org/342993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278700 0039d316-1c4b-4281-b951-d872f2087c98

content/test/gpu/gpu_tests/memory.py

@@ -83,7 +83,9 @@ class _MemoryValidator(page_test.PageTest):
         '--force-gpu-mem-available-mb=%s' % MEMORY_LIMIT_MB)
 
   def WillNavigateToPage(self, page, tab):
-    custom_categories = ['webkit.console', 'gpu']
+    # FIXME: Remove webkit.console when blink.console lands in chromium and the
+    # ref builds are updated. crbug.com/386847
+    custom_categories = ['webkit.console', 'blink.console', 'gpu']
     tab.browser.StartTracing(','.join(custom_categories), 60)
 
   def _FormatException(self, low_or_high, mb_used):

tools/perf/measurements/image_decoding.py

@@ -27,8 +27,11 @@ class ImageDecoding(page_measurement.PageMeasurement):
     self._power_metric.Start(page, tab)
     # FIXME: bare 'devtools' is for compatibility with older reference versions
     # only and may eventually be removed.
+    # FIXME: Remove webkit.console when blink.console lands in chromium and
+    # the ref builds are updated. crbug.com/386847
     tab.browser.StartTracing(
-        'disabled-by-default-devtools.timeline*,devtools,webkit.console')
+        'disabled-by-default-devtools.timeline*,' +
+            'devtools,webkit.console,blink.console')
 
   def StopBrowserAfterPage(self, browser, page):
     return not browser.tabs[0].ExecuteJavaScript("""

tools/perf/measurements/smoothness_controller.py

@@ -26,7 +26,9 @@ class SmoothnessController(object):
     self._interaction = None
 
   def Start(self, page, tab):
-    custom_categories = ['webkit.console', 'benchmark']
+    # FIXME: Remove webkit.console when blink.console lands in chromium and
+    # the ref builds are updated. crbug.com/386847
+    custom_categories = ['webkit.console', 'blink.console', 'benchmark']
     custom_categories += page.GetSyntheticDelayCategories()
     tab.browser.StartTracing(','.join(custom_categories), 60)
     if tab.browser.platform.IsRawDisplayFrameRateSupported():

tools/perf/measurements/smoothness_unittest.py

@@ -68,11 +68,16 @@ class SmoothnessUnitTest(
         'DELAY(cc.BeginMainFrame;0.012000;static)',
         'DELAY(cc.DrawAndSwap;0.012000;alternating)',
         'DELAY(gpu.PresentingFrame;0.012000;static)',
-        'benchmark',
-        'webkit.console'
+        'benchmark'
     ]
     actual_category_filter = tab.browser.category_filter.split(',')
     actual_category_filter.sort()
+
+    # FIXME: Put blink.console into the expected above and remove these two
+    # remove entries when the blink.console change has rolled into chromium.
+    actual_category_filter.remove('webkit.console')
+    actual_category_filter.remove('blink.console')
+
     if expected_category_filter != actual_category_filter:
       sys.stderr.write("Expected category filter: %s\n" %
                        repr(expected_category_filter))

tools/telemetry/telemetry/core/backends/chrome/tracing_backend.py

@@ -15,9 +15,12 @@ DEFAULT_TRACE_CATEGORIES = None
 # Categories for absolute minimum overhead tracing. This contains no
 # sub-traces of thread tasks, so it's only useful for capturing the
 # cpu-time spent on threads (as well as needed benchmark traces)
+# FIXME: Remove webkit.console when blink.console lands in chromium and
+# the ref builds are updated. crbug.com/386847
 MINIMAL_TRACE_CATEGORIES = ("toplevel,"
                             "benchmark,"
                             "webkit.console,"
+                            "blink.console,"
                             "trace_event_overhead")