[polymer] Merge of master into polymer10-migration

systrace/systrace/tracing_agents/battor_trace_agent_unittest.py

 #!/usr/bin/env python
 
 # Copyright 2016 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.
 
 from collections import namedtuple
 import unittest
 import logging
 
@@ skipping 61 matching lines @@
     if self._StopTracing_error:
       raise RuntimeError('Simulated error in StopTracing')
     self._running = False
     self._tracing = False
     self._output = True
 
   def CollectTraceData(self):
     assert self._output
     if self._CollectTraceData_error:
       raise RuntimeError('Simulated error in CollectTraceData')
-    return ['traceout1', 'traceout2']
+    return 'traceout1\ntraceout2'
 
 class MockBatteryUtils(object):
   def __init__(self, _):
     self._is_charging = True
 
   def GetCharging(self):
     return self._is_charging
 
   def SetCharging(self, value):
     self._is_charging = value
@@ skipping 44 matching lines @@
                       StopTracing_error=False, CollectTraceData_error=False)
     agent = battor_trace_agent.BattorTraceAgent()
     agent.StartAgentTracing(OPTIONS, CATEGORIES)
     agent.StopAgentTracing()
     x = agent.GetResults()
     self.assertEqual(x.raw_data, 'traceout1\ntraceout2')
 
 if __name__ == "__main__":
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)