Revert of [Telemetry] Change how trace_data detects if data being added is valid.

telemetry/telemetry/timeline/trace_data_unittest.py

Index: telemetry/telemetry/timeline/trace_data_unittest.py
diff --git a/telemetry/telemetry/timeline/trace_data_unittest.py b/telemetry/telemetry/timeline/trace_data_unittest.py
index 1db2a44a5e0280dd3a681d75254504479f3c60ab..15c487d32684f762afe76a58484a404f702325eb 100644
--- a/telemetry/telemetry/timeline/trace_data_unittest.py
+++ b/telemetry/telemetry/timeline/trace_data_unittest.py
@@ -90,33 +90,23 @@
     builder = trace_data.TraceDataBuilder()
     builder.AddEventsTo(trace_data.CHROME_TRACE_PART, [1, 2, 3])
     builder.AddEventsTo(trace_data.TAB_ID_PART, ['tab-7'])
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, 'battor data here')
+    builder.AddEventsTo(
+        trace_data.BATTOR_TRACE_PART, 'battor data here', as_string=True)
 
     d = builder.AsData()
     self.assertTrue(d.HasEventsFor(trace_data.CHROME_TRACE_PART))
     self.assertTrue(d.HasEventsFor(trace_data.TAB_ID_PART))
     self.assertTrue(d.HasEventsFor(trace_data.BATTOR_TRACE_PART))
+
     self.assertRaises(Exception, builder.AsData)
 
-  def testAddEventsToWithString(self):
+  def testAsStringWithList(self):
     builder = trace_data.TraceDataBuilder()
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, 'battor data here')
-    d = builder.AsData()
-    self.assertTrue(d.HasEventsFor(trace_data.BATTOR_TRACE_PART))
-    battor_part = d.GetEventsFor(trace_data.BATTOR_TRACE_PART)
-    self.assertTrue(isinstance(battor_part, basestring))
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.BATTOR_TRACE_PART,
+                          ['battor data here'], as_string=True)
 
-  def testAddEventsToWithStringMultipleTimes(self):
+  def testNotAsStringWithString(self):
     builder = trace_data.TraceDataBuilder()
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, 'data1')
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, 'data2')
-    d = builder.AsData()
-    self.assertTrue(d.HasEventsFor(trace_data.BATTOR_TRACE_PART))
-    battor_part = d.GetEventsFor(trace_data.BATTOR_TRACE_PART)
-    self.assertTrue(isinstance(battor_part, basestring))
-    self.assertTrue(battor_part == 'data1data2')
-
-  def testAddEventsInvalidType(self):
-    builder = trace_data.TraceDataBuilder()
-    with self.assertRaises(TypeError):
-      builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, 1)
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.CHROME_TRACE_PART, 'data here')