[Device Sensors] Remove BrowserThread knowledge

content/browser/device_sensors/sensor_manager_android.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 <string.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram_macros.h"
-#include "content/public/browser/browser_thread.h"
 #include "jni/DeviceSensors_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 
 namespace {
 
 void UpdateDeviceOrientationHistogram(
     content::SensorManagerAndroid::OrientationSensorType type) {
   UMA_HISTOGRAM_ENUMERATION("InertialSensor.DeviceOrientationSensorAndroid",
@@ skipping 26 matching lines @@
 namespace content {
 
 SensorManagerAndroid::SensorManagerAndroid()
     : number_active_device_motion_sensors_(0),
       device_light_buffer_(nullptr),
       device_motion_buffer_(nullptr),
       device_orientation_buffer_(nullptr),
       motion_buffer_initialized_(false),
       orientation_buffer_initialized_(false),
       is_shutdown_(false) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());

[timvolodine, 2016/10/31 15:52:46]

can we add an explicit UI thread check here? to avoid somebody potentially
runnig this on a non-UI thread..

[blundell, 2016/11/09 16:00:46]

Done in GetInstance(), the initial entrypoint.

   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   device_sensors_.Reset(Java_DeviceSensors_getInstance(
       AttachCurrentThread(), base::android::GetApplicationContext()));
 }
 
 SensorManagerAndroid::~SensorManagerAndroid() {
 }
 
 bool SensorManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ skipping 129 matching lines @@
 
   if (!device_light_buffer_)
     return;
 
   device_light_buffer_->seqlock.WriteBegin();
   device_light_buffer_->data.value = value;
   device_light_buffer_->seqlock.WriteEnd();
 }
 
 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
                                  : kDeviceSensorIntervalMicroseconds;
   return Java_DeviceSensors_start(
       AttachCurrentThread(), device_sensors_, reinterpret_cast<intptr_t>(this),
       static_cast<jint>(consumer_type), rate_in_microseconds);
 }
 
 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_);
 }
 
 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(),
                                                       device_sensors_));
 }
 
 // ----- Shared memory API methods
 
 // --- Device Light
 
 void SensorManagerAndroid::StartFetchingDeviceLightData(
     DeviceLightHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(light_buffer_lock_);
     device_light_buffer_ = buffer;
     SetLightBufferValue(-1);
   }
   bool success = Start(CONSUMER_TYPE_LIGHT);
   if (!success) {
     base::AutoLock autolock(light_buffer_lock_);
     SetLightBufferValue(std::numeric_limits<double>::infinity());
   }
 }
 
 void SensorManagerAndroid::StopFetchingDeviceLightData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_LIGHT);
   {
     base::AutoLock autolock(light_buffer_lock_);
     if (device_light_buffer_) {
       SetLightBufferValue(-1);
       device_light_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::SetLightBufferValue(double lux) {
   device_light_buffer_->seqlock.WriteBegin();
   device_light_buffer_->data.value = lux;
   device_light_buffer_->seqlock.WriteEnd();
 }
 
 // --- Device Motion
 
 void SensorManagerAndroid::StartFetchingDeviceMotionData(
     DeviceMotionHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(motion_buffer_lock_);
     device_motion_buffer_ = buffer;
     ClearInternalMotionBuffers();
   }
   Start(CONSUMER_TYPE_MOTION);
 
   // If no motion data can ever be provided, the number of active device motion
   // sensors will be zero. In that case flag the shared memory buffer
   // as ready to read, as it will not change anyway.
   number_active_device_motion_sensors_ = GetNumberActiveDeviceMotionSensors();
   {
     base::AutoLock autolock(motion_buffer_lock_);
     CheckMotionBufferReadyToRead();
   }
 }
 
 void SensorManagerAndroid::StopFetchingDeviceMotionData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_MOTION);
   {
     base::AutoLock autolock(motion_buffer_lock_);
     if (device_motion_buffer_) {
       ClearInternalMotionBuffers();
       device_motion_buffer_ = nullptr;
     }
@@ skipping 32 matching lines @@
 void SensorManagerAndroid::ClearInternalMotionBuffers() {
   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   number_active_device_motion_sensors_ = 0;
   SetMotionBufferReadyStatus(false);
 }
 
 // --- Device Orientation
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationData(
     DeviceOrientationHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     device_orientation_buffer_ = buffer;
   }
   bool success = Start(CONSUMER_TYPE_ORIENTATION);
 
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     // If Start() was unsuccessful then set the buffer ready flag to true
     // to start firing all-null events.
     SetOrientationBufferStatus(buffer, !success /* ready */,
         false /* absolute */);
     orientation_buffer_initialized_ = !success;
   }
 
   if (!success)
     UpdateDeviceOrientationHistogram(NOT_AVAILABLE);
 }
 
 void SensorManagerAndroid::StopFetchingDeviceOrientationData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_ORIENTATION);
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     if (device_orientation_buffer_) {
       SetOrientationBufferStatus(device_orientation_buffer_, false, false);
       orientation_buffer_initialized_ = false;
       device_orientation_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationAbsoluteData(
     DeviceOrientationHardwareBuffer* buffer) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     device_orientation_absolute_buffer_ = buffer;
   }
   bool success = Start(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
 
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     // If Start() was unsuccessful then set the buffer ready flag to true
     // to start firing all-null events.
     SetOrientationBufferStatus(buffer, !success /* ready */,
         false /* absolute */);
     orientation_absolute_buffer_initialized_ = !success;
   }
 }
 
 void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     if (device_orientation_absolute_buffer_) {
       SetOrientationBufferStatus(device_orientation_absolute_buffer_, false,
           false);
       orientation_absolute_buffer_initialized_ = false;
       device_orientation_absolute_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::Shutdown() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
   is_shutdown_ = true;
 }
 
 }  // namespace content