Remove content::BrowserThread knowledge from Device Sensors

content/browser/device_sensors/sensor_manager_android_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/device_sensors/sensor_manager_android.h"
 
 #include <memory>
 
 #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 {
 
 namespace {
 
 class FakeSensorManagerAndroid : public SensorManagerAndroid {
  public:
   FakeSensorManagerAndroid() {}
   ~FakeSensorManagerAndroid() override {}
@@ skipping 36 matching lines @@
     ASSERT_EQ(beta, buffer->data.beta);
     ASSERT_TRUE(buffer->data.hasBeta);
     ASSERT_EQ(gamma, buffer->data.gamma);
     ASSERT_TRUE(buffer->data.hasGamma);
   }
 
   std::unique_ptr<DeviceLightHardwareBuffer> light_buffer_;
   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());
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3);
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
   ASSERT_EQ(1, motion_buffer_->data.accelerationX);
   ASSERT_TRUE(motion_buffer_->data.hasAccelerationX);
   ASSERT_EQ(2, motion_buffer_->data.accelerationY);
@@ skipping 21 matching lines @@
   ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
             motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
   sensorManager.SetNumberActiveDeviceMotionSensors(2);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3);
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotAccelerationIncludingGravity(nullptr, nullptr, 1, 2, 3);
   ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
   ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
             motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
   sensorManager.SetNumberActiveDeviceMotionSensors(0);
 
   sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
   ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
   ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
             motion_buffer_->data.interval);
 
   sensorManager.StopFetchingDeviceMotionData();
   ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceOrientationData(orientation_buffer_.get());
   ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotOrientation(nullptr, nullptr, 1, 2, 3);
   VerifyOrientationBufferValues(orientation_buffer_.get(), 1, 2, 3);
 
   sensorManager.StopFetchingDeviceOrientationData();
   ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
 }
 
 TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceOrientationAbsoluteData(
       orientation_absolute_buffer_.get());
   ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
 
   sensorManager.GotOrientationAbsolute(nullptr, nullptr, 4, 5, 6);
   VerifyOrientationBufferValues(orientation_absolute_buffer_.get(), 4, 5, 6);
 
   sensorManager.StopFetchingDeviceOrientationData();
   ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
 }
 
 // DeviceLight
 TEST_F(AndroidSensorManagerTest, DeviceLightSensorsActive) {
   FakeSensorManagerAndroid::Register(base::android::AttachCurrentThread());
   FakeSensorManagerAndroid sensorManager;
+  sensorManager.InitOnUIThread();
 
   sensorManager.StartFetchingDeviceLightData(light_buffer_.get());
 
   sensorManager.GotLight(nullptr, nullptr, 100);
   ASSERT_EQ(100, light_buffer_->data.value);
 
   sensorManager.StopFetchingDeviceLightData();
   ASSERT_EQ(-1, light_buffer_->data.value);
 }
 
 }  // namespace
 
 }  // namespace content