1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/content/browser/battery_monitor_browsertest.cc b/chromium/content/browser/battery_monitor_browsertest.cc
index 47fd0272c78..ebbad43bd15 100644
--- a/chromium/content/browser/battery_monitor_browsertest.cc
+++ b/chromium/content/browser/battery_monitor_browsertest.cc
@@ -71,9 +71,7 @@ class MockBatteryMonitor : public device::mojom::BatteryMonitor {
 
 class BatteryMonitorTest : public ContentBrowserTest {
  public:
-  BatteryMonitorTest() = default;
-
-  void SetUpOnMainThread() override {
+  BatteryMonitorTest() {
     mock_battery_monitor_ = std::make_unique<MockBatteryMonitor>();
     // Because Device Service also runs in this process(browser process), here
     // we can directly set our binder to intercept interface requests against
@@ -84,6 +82,11 @@ class BatteryMonitorTest : public ContentBrowserTest {
                    base::Unretained(mock_battery_monitor_.get())));
   }
 
+  ~BatteryMonitorTest() override {
+    service_manager::ServiceContext::ClearGlobalBindersForTesting(
+        device::mojom::kServiceName);
+  }
+
  protected:
   MockBatteryMonitor* mock_battery_monitor() {
     return mock_battery_monitor_.get();