Remove content::BrowserThread knowledge from Device Sensors

content/browser/device_sensors/sensor_manager_android_unittest.cc

Index: content/browser/device_sensors/sensor_manager_android_unittest.cc
diff --git a/content/browser/device_sensors/sensor_manager_android_unittest.cc b/content/browser/device_sensors/sensor_manager_android_unittest.cc
index f773fd8023e489ceae89fe47939d8fd7c9bba5c5..9372b9996065d7b15bd31c06114f27fc0c0bfa35 100644
--- a/content/browser/device_sensors/sensor_manager_android_unittest.cc
+++ b/content/browser/device_sensors/sensor_manager_android_unittest.cc
@@ -8,8 +8,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop/message_loop.h"
 #include "content/browser/device_sensors/device_sensors_consts.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
@@ -66,12 +66,13 @@ class AndroidSensorManagerTest : public testing::Test {
   std::unique_ptr<DeviceMotionHardwareBuffer> motion_buffer_;
   std::unique_ptr<DeviceOrientationHardwareBuffer> orientation_buffer_;
   std::unique_ptr<DeviceOrientationHardwareBuffer> orientation_absolute_buffer_;
-  content::TestBrowserThreadBundle thread_bundle_;
+  base::MessageLoop message_loop_;
 };
 
 TEST_F(AndroidSensorManagerTest, ThreeDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
   sensorManager.SetNumberActiveDeviceMotionSensors(3);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
@@ -113,6 +114,7 @@ TEST_F(AndroidSensorManagerTest, ThreeDeviceMotionSensorsActive) {
 TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
   sensorManager.SetNumberActiveDeviceMotionSensors(2);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
@@ -133,6 +135,7 @@ TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
 TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
   sensorManager.SetNumberActiveDeviceMotionSensors(0);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
@@ -147,6 +150,7 @@ TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
 TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceOrientationData(orientation_buffer_.get());
   ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
@@ -161,6 +165,7 @@ TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
 TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceOrientationAbsoluteData(
       orientation_absolute_buffer_.get());
@@ -177,6 +182,7 @@ TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) {
 TEST_F(AndroidSensorManagerTest, DeviceLightSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceLightData(light_buffer_.get());