[polymer] Merge of master into polymer10-migration

telemetry/telemetry/timeline/chrome_trace_config.py

Index: telemetry/telemetry/timeline/chrome_trace_config.py
diff --git a/telemetry/telemetry/timeline/chrome_trace_config.py b/telemetry/telemetry/timeline/chrome_trace_config.py
index 7faf00e9486bddc1ae43f2afc9b4e6ccb4e19e68..850b84ea018a473149dae2980342da92e5c89354 100644
--- a/telemetry/telemetry/timeline/chrome_trace_config.py
+++ b/telemetry/telemetry/timeline/chrome_trace_config.py
@@ -4,14 +4,12 @@
 
 import re
 
-from telemetry.timeline import tracing_category_filter
+from telemetry.timeline import chrome_trace_category_filter
 
 
 RECORD_MODE_PARAM = 'record_mode'
-ENABLE_SYSTRACE_PARAM = 'enable_systrace'
 
 ECHO_TO_CONSOLE = 'trace-to-console'
-ENABLE_SYSTRACE = 'enable-systrace'
 RECORD_AS_MUCH_AS_POSSIBLE = 'record-as-much-as-possible'
 RECORD_CONTINUOUSLY = 'record-continuously'
 RECORD_UNTIL_FULL = 'record-until-full'
@@ -59,42 +57,38 @@ class ChromeTraceConfig(object):
 
     record_mode: can be any mode in RECORD_MODE_MAP. This corresponds to
         record modes in chrome.
-    enable_systrace: a boolean that specifies whether to enable systrace.
-    tracing_category_filter: Object that specifies which tracing
-        categories to trace.
+    category_filter: Object that specifies which tracing categories to trace.
     memory_dump_config: Stores the triggers for memory dumps.
-
   """
 
   def __init__(self):
     self._record_mode = RECORD_AS_MUCH_AS_POSSIBLE
-    self._enable_systrace = False
-    self._tracing_category_filter = (
-        tracing_category_filter.TracingCategoryFilter())
+    self._category_filter = (
+        chrome_trace_category_filter.ChromeTraceCategoryFilter())
     self._memory_dump_config = None
 
-  @property
-  def tracing_category_filter(self):
-    return self._tracing_category_filter
-
-  def SetNoOverheadFilter(self):
-    self._tracing_category_filter = (
-        tracing_category_filter.CreateNoOverheadFilter())
+  def SetLowOverheadFilter(self):
+    self._category_filter = (
+        chrome_trace_category_filter.CreateLowOverheadFilter())
 
-  def SetMinimalOverheadFilter(self):
-    self._tracing_category_filter = (
-        tracing_category_filter.CreateMinimalOverheadFilter())
+  def SetDefaultOverheadFilter(self):
+    self._category_filter = (
+        chrome_trace_category_filter.CreateDefaultOverheadFilter())
 
   def SetDebugOverheadFilter(self):
-    self._tracing_category_filter = (
-        tracing_category_filter.CreateDebugOverheadFilter())
+    self._category_filter = (
+        chrome_trace_category_filter.CreateDebugOverheadFilter())
+
+  @property
+  def category_filter(self):
+    return self._category_filter
 
-  def SetTracingCategoryFilter(self, cf):
-    if isinstance(cf, tracing_category_filter.TracingCategoryFilter):
-      self._tracing_category_filter = cf
+  def SetCategoryFilter(self, cf):
+    if isinstance(cf, chrome_trace_category_filter.ChromeTraceCategoryFilter):
+      self._category_filter = cf
     else:
       raise TypeError(
-          'Must pass SetTracingCategoryFilter a TracingCategoryFilter instance')
+          'Must pass SetCategoryFilter a ChromeTraceCategoryFilter instance')
 
   def SetMemoryDumpConfig(self, dump_config):
     if isinstance(dump_config, MemoryDumpConfig):
@@ -112,26 +106,17 @@ class ChromeTraceConfig(object):
     assert value in RECORD_MODE_MAP
     self._record_mode = value
 
-  @property
-  def enable_systrace(self):
-    return self._enable_systrace
-
-  @enable_systrace.setter
-  def enable_systrace(self, value):
-    self._enable_systrace = value
-
   def GetChromeTraceConfigForStartupTracing(self):
     """Map the config to a JSON string for startup tracing.
 
     All keys in the returned dictionary use underscore-case (e.g.
-    'enable_systrace'). In addition, the 'record_mode' value uses hyphen-case
+    'record_mode'). In addition, the 'record_mode' value uses hyphen-case
     (e.g. 'record-until-full').
     """
     result = {
-        RECORD_MODE_PARAM: RECORD_MODE_MAP[self._record_mode],
-        ENABLE_SYSTRACE_PARAM: self._enable_systrace
+        RECORD_MODE_PARAM: RECORD_MODE_MAP[self._record_mode]
     }
-    result.update(self._tracing_category_filter.GetDictForChromeTracing())
+    result.update(self._category_filter.GetDictForChromeTracing())
     if self._memory_dump_config:
       result.update(self._memory_dump_config.GetDictForChromeTracing())
     return result
@@ -161,7 +146,7 @@ class ChromeTraceConfig(object):
   def GetChromeTraceConfigForDevTools(self):
     """Map the config to a DevTools API config dictionary.
 
-    All keys in the returned dictionary use camel-case (e.g. 'enableSystrace').
+    All keys in the returned dictionary use camel-case (e.g. 'recordMode').
     In addition, the 'recordMode' value also uses camel-case (e.g.
     'recordUntilFull'). This is to invert the camel-case ->
     underscore/hyphen-delimited mapping performed in Chromium devtools.
@@ -176,9 +161,7 @@ class ChromeTraceConfig(object):
     """Map the categories and options to their DevTools API counterparts."""
     assert not self.requires_modern_devtools_tracing_start_api
     options_parts = [RECORD_MODE_MAP[self._record_mode]]
-    if self._enable_systrace:
-      options_parts.append(ENABLE_SYSTRACE)
-    return (self._tracing_category_filter.stable_filter_string,
+    return (self._category_filter.stable_filter_string,
             ','.join(options_parts))