Pass in custom options to Systrace agents

systrace/systrace/tracing_agents/atrace_agent_unittest.py

Index: systrace/systrace/tracing_agents/atrace_agent_unittest.py
diff --git a/systrace/systrace/tracing_agents/atrace_agent_unittest.py b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
index 73b3251dada247bf9f557e9b9bf691543f5571d8..c0651b843448d79063bc1126246a7155265dc02c 100755
--- a/systrace/systrace/tracing_agents/atrace_agent_unittest.py
+++ b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
@@ -54,7 +54,8 @@ class AtraceAgentTest(unittest.TestCase):
   @decorators.HostOnlyTest
   def test_construct_atrace_args(self):
     options, categories = run_systrace.parse_options(SYSTRACE_CMD)
-    tracer_args = atrace_agent._construct_atrace_args(options, categories)
+    options.atrace_categories = categories
+    tracer_args = atrace_agent._construct_atrace_args(options)
     self.assertEqual(' '.join(TRACE_ARGS), ' '.join(tracer_args))
 
   @decorators.HostOnlyTest
@@ -65,8 +66,8 @@ class AtraceAgentTest(unittest.TestCase):
       atrace_data_raw = f2.read()
       options, categories = run_systrace.parse_options(STOP_FIX_UPS)
       agent = atrace_agent.AtraceAgent()
-      agent._options = options
-      agent._categories = categories
+      agent._config = options
+      agent._config.atrace_categories = categories
       trace_data = agent._preprocess_trace_data(atrace_data_raw)
       self.assertEqual(atrace_data, trace_data)