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

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

Index: telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py
diff --git a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py
index 3a14785807e9fd1fc21154d5643aba6002da7a8a..f91903403b3826bb9ede891e662397ef77d0c065 100644
--- a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py
+++ b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py
@@ -6,24 +6,11 @@
 
 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']
-
-
-class FakeBatteryUtils(object):
-  def __init__(self, device):
-    self._device = device
-    self._charging_state = True
-
-  def SetCharging(self, state):
-    self._charging_state = state
-
-  def GetCharging(self):
-    return self._charging_state
 
 
 class FakePlatformBackend(object):
@@ -96,9 +83,6 @@
     battor_wrapper.BattorWrapper = FakeBattOr
     battor_wrapper.IsBattOrConnected = lambda x, android_device=None: True
 
-    self._battery_utils = battery_utils.BatteryUtils
-    battery_utils.BatteryUtils = FakeBatteryUtils
-
     # Agents and backends.
     self.android_backend = FakeAndroidPlatformBackend()
     self.desktop_backend = FakeDesktopPlatformBackend()
@@ -168,14 +152,7 @@
     builder = builder.AsData()
     self.assertTrue(builder.HasEventsFor(trace_data.BATTOR_TRACE_PART))
     data_from_builder = builder.GetEventsFor(trace_data.BATTOR_TRACE_PART)
-    self.assertEqual('\n'.join(_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())
+    self.assertListEqual(['\n'.join(_BATTOR_RETURN)], data_from_builder)
 
   def testRecordClockSyncMarker(self):
     def callback_with_exception(a, b):