[Device Sensors] Remove BrowserThread knowledge

content/browser/device_sensors/sensor_manager_android.cc

Index: content/browser/device_sensors/sensor_manager_android.cc
diff --git a/content/browser/device_sensors/sensor_manager_android.cc b/content/browser/device_sensors/sensor_manager_android.cc
index 0c4a23049c44dfe6b7a8dc3446d41e2df3f37ef4..65f5771148e349e7d2c9e4e73edd62ae518a4bf0 100644
--- a/content/browser/device_sensors/sensor_manager_android.cc
+++ b/content/browser/device_sensors/sensor_manager_android.cc
@@ -10,8 +10,8 @@
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
+#include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
-#include "content/public/browser/browser_thread.h"
 #include "jni/DeviceSensors_jni.h"
 
 using base::android::AttachCurrentThread;
@@ -58,7 +58,7 @@ SensorManagerAndroid::SensorManagerAndroid()
       motion_buffer_initialized_(false),
       orientation_buffer_initialized_(false),
       is_shutdown_(false) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   device_sensors_.Reset(Java_DeviceSensors_getInstance(
       AttachCurrentThread(), base::android::GetApplicationContext()));
@@ -72,7 +72,7 @@ bool SensorManagerAndroid::Register(JNIEnv* env) {
 }
 
 SensorManagerAndroid* SensorManagerAndroid::GetInstance() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
   return base::Singleton<
       SensorManagerAndroid,
       base::LeakySingletonTraits<SensorManagerAndroid>>::get();
@@ -209,7 +209,7 @@ void SensorManagerAndroid::GotLight(JNIEnv*,
 }
 
 bool SensorManagerAndroid::Start(ConsumerType consumer_type) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!device_sensors_.is_null());
   int rate_in_microseconds = (consumer_type == CONSUMER_TYPE_LIGHT)
                                  ? kLightSensorIntervalMicroseconds
@@ -220,14 +220,14 @@ bool SensorManagerAndroid::Start(ConsumerType consumer_type) {
 }
 
 void SensorManagerAndroid::Stop(ConsumerType consumer_type) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!device_sensors_.is_null());
   Java_DeviceSensors_stop(AttachCurrentThread(), device_sensors_,
                           static_cast<jint>(consumer_type));
 }
 
 int SensorManagerAndroid::GetNumberActiveDeviceMotionSensors() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!device_sensors_.is_null());
   return Java_DeviceSensors_getNumberActiveDeviceMotionSensors(
       AttachCurrentThread(), device_sensors_);
@@ -235,7 +235,7 @@ int SensorManagerAndroid::GetNumberActiveDeviceMotionSensors() {
 
 SensorManagerAndroid::OrientationSensorType
 SensorManagerAndroid::GetOrientationSensorTypeUsed() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!device_sensors_.is_null());
   return static_cast<SensorManagerAndroid::OrientationSensorType>(
       Java_DeviceSensors_getOrientationSensorTypeUsed(AttachCurrentThread(),
@@ -248,7 +248,7 @@ SensorManagerAndroid::GetOrientationSensorTypeUsed() {
 
 void SensorManagerAndroid::StartFetchingDeviceLightData(
     DeviceLightHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
@@ -266,7 +266,7 @@ void SensorManagerAndroid::StartFetchingDeviceLightData(
 }
 
 void SensorManagerAndroid::StopFetchingDeviceLightData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
@@ -290,7 +290,7 @@ void SensorManagerAndroid::SetLightBufferValue(double lux) {
 
 void SensorManagerAndroid::StartFetchingDeviceMotionData(
     DeviceMotionHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
@@ -313,7 +313,7 @@ void SensorManagerAndroid::StartFetchingDeviceMotionData(
 }
 
 void SensorManagerAndroid::StopFetchingDeviceMotionData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
@@ -366,7 +366,7 @@ void SensorManagerAndroid::ClearInternalMotionBuffers() {
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationData(
     DeviceOrientationHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
@@ -391,7 +391,7 @@ void SensorManagerAndroid::StartFetchingDeviceOrientationData(
 }
 
 void SensorManagerAndroid::StopFetchingDeviceOrientationData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
@@ -408,7 +408,7 @@ void SensorManagerAndroid::StopFetchingDeviceOrientationData() {
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationAbsoluteData(
     DeviceOrientationHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
@@ -430,7 +430,7 @@ void SensorManagerAndroid::StartFetchingDeviceOrientationAbsoluteData(
 }
 
 void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
@@ -447,7 +447,7 @@ void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() {
 }
 
 void SensorManagerAndroid::Shutdown() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   is_shutdown_ = true;
 }