diff --git a/content/browser/generic_sensor_browsertest.cc b/content/browser/generic_sensor_browsertest.cc
index 0f16425..d275d64 100644
--- a/content/browser/generic_sensor_browsertest.cc
+++ b/content/browser/generic_sensor_browsertest.cc
@@ -4,6 +4,7 @@

 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
@@ -62,6 +63,10 @@ class FakeAmbientLightSensor : public device::PlatformSensor {

 class FakeSensorProvider : public device::PlatformSensorProvider {
  public:
+  static FakeSensorProvider* GetInstance() {
+    return base::Singleton<FakeSensorProvider, base::LeakySingletonTraits<
+                                                   FakeSensorProvider>>::get();
+  }
   FakeSensorProvider() = default;
   ~FakeSensorProvider() override = default;

@@ -104,26 +109,16 @@ class GenericSensorBrowserTest : public ContentBrowserTest {
   }

   void SetUpOnIOThread() {
-    fake_sensor_provider_ = new FakeSensorProvider();
     device::PlatformSensorProvider::SetProviderForTesting(
-        fake_sensor_provider_);
+        FakeSensorProvider::GetInstance());
     io_loop_finished_event_.Signal();
   }

-  void TearDown() override {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&GenericSensorBrowserTest::TearDownOnIOThread,
-                   base::Unretained(this)));
-  }
-
-  void TearDownOnIOThread() {
+  void TearDownOnMainThread() override {
     device::PlatformSensorProvider::SetProviderForTesting(nullptr);
-    delete fake_sensor_provider_;
   }

  public:
-  FakeSensorProvider* fake_sensor_provider_;
   base::WaitableEvent io_loop_finished_event_;
 };