Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: content/browser/device_sensors/device_sensor_service.cc

Issue 2410123002: Remove content::BrowserThread knowledge from Device Sensors (Closed)
Patch Set: Rebase, avoid object creation on startup Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « content/browser/device_sensors/device_sensor_service.h ('k') | content/browser/device_sensors/sensor_manager_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698