Pass in custom options to Systrace agents

systrace/systrace/tracing_agents/ftrace_agent_unittest.py

Index: systrace/systrace/tracing_agents/ftrace_agent_unittest.py
diff --git a/systrace/systrace/tracing_agents/ftrace_agent_unittest.py b/systrace/systrace/tracing_agents/ftrace_agent_unittest.py
index 4a374ebc69ae604429aa18591d90033cf7a35509..fdc54cdaab3022b89fef46cd4979bdfdc10579f5 100755
--- a/systrace/systrace/tracing_agents/ftrace_agent_unittest.py
+++ b/systrace/systrace/tracing_agents/ftrace_agent_unittest.py
@@ -114,11 +114,12 @@ class FtraceAgentTest(unittest.TestCase):
     io_interface = make_test_io_interface(permitted_files)
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ["irq"]
     options, categories = run_systrace.parse_options(systrace_cmd)
+    options.ftrace_categories = categories
     agent = ftrace_agent.FtraceAgent(io_interface)
     self.assertEqual(['irq'], agent._avail_categories())
 
     # confirm all the event nodes are turned on during tracing
-    agent.StartAgentTracing(options, categories)
+    agent.StartAgentTracing(options)
     self.assertEqual(permitted_files[irq_event_path], "1")
     self.assertEqual(permitted_files[ipi_event_path], "1")
 
@@ -133,8 +134,8 @@ class FtraceAgentTest(unittest.TestCase):
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ['-b', '16000']
     options, categories = run_systrace.parse_options(systrace_cmd)
     agent = ftrace_agent.FtraceAgent()
-    agent._options = options
-    agent._categories = categories
+    agent._config = options
+    agent._config.atrace_categories = categories
     self.assertEqual(agent._get_trace_buffer_size(), 16000)
 
 if __name__ == "__main__":