Allow blink.console or webkit.console in telemetry

tools/perf/measurements/smoothness_unittest.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 sys
 
 from measurements import smoothness
 from telemetry.core import wpr_modes
 from telemetry.page import page
 from telemetry.page import page_measurement_unittest_base
 # pylint: disable=W0401,W0614
@@ skipping 50 matching lines @@
     }
 
     tab = FakeTab()
     measurement = smoothness.Smoothness()
     measurement.WillRunActions(test_page, tab)
 
     expected_category_filter = [
         '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))
       sys.stderr.write("Actual category filter filter: %s\n" %
                        repr(actual_category_filter))
     self.assertEquals(expected_category_filter, actual_category_filter)
 
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
     self._options.browser_options.wpr_mode = wpr_modes.WPR_OFF
@@ skipping 34 matching lines @@
     measurement = smoothness.Smoothness()
     results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(results.failures))
 
     mostly_smooth = results.FindAllPageSpecificValuesNamed('mostly_smooth')
     self.assertEquals(len(mostly_smooth), 1)
     self.assertGreaterEqual(mostly_smooth[0].GetRepresentativeNumber(), 0)
 
   def testCleanUpTrace(self):
     self.TestTracingCleanedUp(smoothness.Smoothness, self._options)