Index: content/browser/device_sensors/device_sensor_service.cc |
diff --git a/content/browser/device_sensors/device_sensor_service.cc b/content/browser/device_sensors/device_sensor_service.cc |
index 827600740f7c4bf3355020a3fbe8c85e782f53ee..3f34fa9204b11cf07208fb8b1983b8ff3ea13652 100644 |
--- a/content/browser/device_sensors/device_sensor_service.cc |
+++ b/content/browser/device_sensors/device_sensor_service.cc |
@@ -46,7 +46,7 @@ void DeviceSensorService::RemoveConsumer(ConsumerType consumer_type) { |
bool DeviceSensorService::ChangeNumberConsumers(ConsumerType consumer_type, |
int delta) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(io_thread_checker_.CalledOnValidThread()); |
if (is_shutdown_) |
return false; |
@@ -91,13 +91,13 @@ int DeviceSensorService::GetNumberConsumers(ConsumerType consumer_type) const { |
mojo::ScopedSharedBufferHandle DeviceSensorService::GetSharedMemoryHandle( |
ConsumerType consumer_type) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(io_thread_checker_.CalledOnValidThread()); |
return data_fetcher_->GetSharedMemoryHandle(consumer_type); |
} |
-void DeviceSensorService::Shutdown() { |
+void DeviceSensorService::ShutDownOnUIThread() { |
if (data_fetcher_) { |
- data_fetcher_->Shutdown(); |
+ data_fetcher_->ShutDownOnUIThread(); |
data_fetcher_.reset(); |
} |
is_shutdown_ = true; |
@@ -106,7 +106,7 @@ void DeviceSensorService::Shutdown() { |
void DeviceSensorService::SetDataFetcherForTesting( |
DataFetcherSharedMemory* test_data_fetcher) { |
if (data_fetcher_) |
- data_fetcher_->Shutdown(); |
+ data_fetcher_->ShutDownOnUIThread(); |
data_fetcher_.reset(test_data_fetcher); |
} |