Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.

telemetry/telemetry/timeline/trace_data.py

Index: telemetry/telemetry/timeline/trace_data.py
diff --git a/telemetry/telemetry/timeline/trace_data.py b/telemetry/telemetry/timeline/trace_data.py
index bda70fc76a9b512250cb0896b5d14bfab3f969df..0f5a4600c35cd8b8d21b27303b8f116956d3b754 100644
--- a/telemetry/telemetry/timeline/trace_data.py
+++ b/telemetry/telemetry/timeline/trace_data.py
@@ -37,7 +37,7 @@
     return self._raw_field_name
 
 
-BATTOR_TRACE_PART = TraceDataPart('powerTraceAsString')
+BATTOR_TRACE_PART = TraceDataPart('battor')
 CHROME_TRACE_PART = TraceDataPart('traceEvents')
 INSPECTOR_TRACE_PART = TraceDataPart('inspectorTimelineEvents')
 SURFACE_FLINGER_PART = TraceDataPart('surfaceFlinger')
@@ -185,22 +185,18 @@
     self._raw_data = None
     return data
 
-  def AddEventsTo(self, part, events, as_string=False):
+  def AddEventsTo(self, part, events):
     """Note: this won't work when called from multiple browsers.
 
     Each browser's trace_event_impl zeros its timestamps when it writes them
     out and doesn't write a timebase that can be used to re-sync them.
     """
     assert isinstance(part, TraceDataPart)
+    assert isinstance(events, list)
     if self._raw_data == None:
       raise Exception('Already called AsData() on this builder.')
 
-    if as_string:
-      assert isinstance(events, basestring)
-      self._raw_data[part.raw_field_name] = events
-    else:
-      assert isinstance(events, list)
-      self._raw_data.setdefault(part.raw_field_name, []).extend(events)
+    self._raw_data.setdefault(part.raw_field_name, []).extend(events)
 
   def HasEventsFor(self, part):
     return _HasEventsFor(part, self._raw_data)