Chromium Code Reviews| Index: content/browser/device_sensors/data_fetcher_shared_memory_base.cc |
| diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc |
| index 6a9b7d287d30eb19c5a26c59dff0b80b873ddfbe..932e7812b79dfce147eb5c3a0281d4d2ae6c3b18 100644 |
| --- a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc |
| +++ b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc |
| @@ -104,8 +104,7 @@ DataFetcherSharedMemoryBase::DataFetcherSharedMemoryBase() |
| } |
| DataFetcherSharedMemoryBase::~DataFetcherSharedMemoryBase() { |
| - StopFetchingDeviceData(CONSUMER_TYPE_MOTION); |
| - StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); |
| + DCHECK(started_consumers_ == 0); |
|
Bernhard Bauer
2014/09/17 16:41:00
If you use DCHECK_EQ() (with the expected value fi
timvolodine
2014/09/17 18:25:00
right, done.
|
| // make sure polling thread stops asap. |
| if (polling_thread_) |
| @@ -163,6 +162,11 @@ bool DataFetcherSharedMemoryBase::StopFetchingDeviceData( |
| return true; |
| } |
| +void DataFetcherSharedMemoryBase::StopFetchingAllDeviceData() { |
| + StopFetchingDeviceData(CONSUMER_TYPE_MOTION); |
| + StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); |
| +} |
| + |
| base::SharedMemoryHandle |
| DataFetcherSharedMemoryBase::GetSharedMemoryHandleForProcess( |
| ConsumerType consumer_type, base::ProcessHandle process) { |
| @@ -240,5 +244,4 @@ bool DataFetcherSharedMemoryBase::IsPollingTimerRunningForTesting() const { |
| return polling_thread_ ? polling_thread_->IsTimerRunning() : false; |
| } |
| - |
| } // namespace content |