[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py

 # 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.
 
 import unittest
 
 from battor import battor_error
 from battor import battor_wrapper
 from devil.android import battery_utils
 from telemetry.internal.platform.tracing_agent import battor_tracing_agent
 from telemetry.timeline import trace_data
 from telemetry.timeline import tracing_config
 
-_BATTOR_RETURN = ['fake', 'battor', 'data']
+_BATTOR_RETURN = 'fake\nbattor\ndata'
 
 
 class FakeBatteryUtils(object):
   def __init__(self, device):
     self._device = device
     self._charging_state = True
 
   def SetCharging(self, state):
     self._charging_state = state
 
@@ skipping 138 matching lines @@
     self.android_agent.StopAgentTracing()
     self.assertTrue(self.android_agent._battor._stop_tracing_called)
 
   def testCollectAgentTraceData(self):
     builder = trace_data.TraceDataBuilder()
     self.android_agent.CollectAgentTraceData(builder)
     self.assertTrue(self.android_agent._battor._collect_trace_data_called)
     builder = builder.AsData()
     self.assertTrue(builder.HasTraceFor(trace_data.BATTOR_TRACE_PART))
     data_from_builder = builder.GetTraceFor(trace_data.BATTOR_TRACE_PART)
-    self.assertEqual('\n'.join(_BATTOR_RETURN), data_from_builder)
+    self.assertEqual(_BATTOR_RETURN, data_from_builder)
 
   def testAndroidCharging(self):
     self.assertTrue(self.android_agent._battery.GetCharging())
     self.assertTrue(self.android_agent.StartAgentTracing(self._config, 0))
     self.assertFalse(self.android_agent._battery.GetCharging())
     self.android_agent.StopAgentTracing()
     self.assertTrue(self.android_agent._battery.GetCharging())
 
   def testRecordClockSyncMarker(self):
     def callback_with_exception(a, b):
       del a # unused
       del b # unused
       raise Exception
     def callback_without_exception(a, b):
       del a # unused
       del b # unused
 
     self.android_agent.RecordClockSyncMarker('123', callback_without_exception)
     with self.assertRaises(Exception):
       self.android_agent.RecordClockSyncMarker('abc', callback_with_exception)