[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/platform/profiler/trace_profiler.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 os
 import StringIO
 import zipfile
 
 from telemetry.internal.platform import profiler
+from telemetry.timeline import chrome_trace_category_filter
 from telemetry.timeline import trace_data as trace_data_module
-from telemetry.timeline import tracing_category_filter
 from telemetry.timeline import tracing_config
 
 
 class TraceProfiler(profiler.Profiler):
 
   def __init__(self, browser_backend, platform_backend, output_path, state,
                categories=None):
     super(TraceProfiler, self).__init__(
         browser_backend, platform_backend, output_path, state)
     assert self._browser_backend.supports_tracing
     # We always want flow events when tracing via telemetry.
     categories_with_flow = 'disabled-by-default-toplevel.flow'
     if categories:
       categories_with_flow += ',%s' % categories
     config = tracing_config.TracingConfig()
     config.enable_chrome_trace = True
-    config.chrome_trace_config.SetTracingCategoryFilter(
-        tracing_category_filter.TracingCategoryFilter(categories_with_flow))
+    config.chrome_trace_config.SetCategoryFilter(
+        chrome_trace_category_filter.ChromeTraceCategoryFilter(
+            categories_with_flow))
     self._browser_backend.StartTracing(config, timeout=10)
 
   @classmethod
   def name(cls):
     return 'trace'
 
   @classmethod
   def is_supported(cls, browser_type):
     return True
 
@@ skipping 33 matching lines @@
 class TraceAllProfiler(TraceProfiler):
 
   def __init__(self, browser_backend, platform_backend, output_path, state):
     super(TraceAllProfiler, self).__init__(
         browser_backend, platform_backend, output_path, state,
         categories='disabled-by-default-*')
 
   @classmethod
   def name(cls):
     return 'trace-all'