Allow blink.console or webkit.console in telemetry

content/test/gpu/gpu_tests/memory.py

 # Copyright (c) 2012 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 memory_expectations
 import page_sets
 
 from telemetry import test
 from telemetry.page import page_test
 from telemetry.timeline import counter
 from telemetry.timeline import model
@@ skipping 65 matching lines @@
 
     if mb_used - WIGGLE_ROOM_MB > MEMORY_LIMIT_MB:
       raise page_test.Failure(self._FormatException('high', mb_used))
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-logging')
     options.AppendExtraBrowserArgs(
         '--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):
     return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % (
       low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB)
 
 class Memory(test.Test):
   """Tests GPU memory limits"""
   test = _MemoryValidator
   page_set = page_sets.MemoryTestsPageSet
 
   def CreateExpectations(self, page_set):
     return memory_expectations.MemoryExpectations()
 
   def CreatePageSet(self, options):
     page_set = super(Memory, self).CreatePageSet(options)
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set