| Index: device/sensors/data_fetcher_shared_memory_base.cc
|
| diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc b/device/sensors/data_fetcher_shared_memory_base.cc
|
| similarity index 91%
|
| rename from content/browser/device_sensors/data_fetcher_shared_memory_base.cc
|
| rename to device/sensors/data_fetcher_shared_memory_base.cc
|
| index 34191f802de57b524b0435a93d407375c97e4459..21a72f1f0977a8f9e4c7278e1ea5b8f74eb96f4c 100644
|
| --- a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc
|
| +++ b/device/sensors/data_fetcher_shared_memory_base.cc
|
| @@ -2,7 +2,7 @@
|
| // 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/data_fetcher_shared_memory_base.h"
|
| +#include "device/sensors/data_fetcher_shared_memory_base.h"
|
|
|
| #include <stddef.h>
|
| #include <string.h>
|
| @@ -19,7 +19,7 @@
|
| #include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
|
| #include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
|
|
|
| -namespace content {
|
| +namespace device {
|
|
|
| namespace {
|
|
|
| @@ -64,17 +64,15 @@ class DataFetcherSharedMemoryBase::PollingThread : public base::Thread {
|
| // --- PollingThread methods
|
|
|
| DataFetcherSharedMemoryBase::PollingThread::PollingThread(
|
| - const char* name, DataFetcherSharedMemoryBase* fetcher)
|
| - : base::Thread(name),
|
| - consumers_bitmask_(0),
|
| - fetcher_(fetcher) {
|
| -}
|
| + const char* name,
|
| + DataFetcherSharedMemoryBase* fetcher)
|
| + : base::Thread(name), consumers_bitmask_(0), fetcher_(fetcher) {}
|
|
|
| -DataFetcherSharedMemoryBase::PollingThread::~PollingThread() {
|
| -}
|
| +DataFetcherSharedMemoryBase::PollingThread::~PollingThread() {}
|
|
|
| void DataFetcherSharedMemoryBase::PollingThread::AddConsumer(
|
| - ConsumerType consumer_type, void* buffer) {
|
| + ConsumerType consumer_type,
|
| + void* buffer) {
|
| DCHECK(fetcher_);
|
| if (!fetcher_->Start(consumer_type, buffer))
|
| return;
|
| @@ -83,9 +81,8 @@ void DataFetcherSharedMemoryBase::PollingThread::AddConsumer(
|
|
|
| if (!timer_ && fetcher_->GetType() == FETCHER_TYPE_POLLING_CALLBACK) {
|
| timer_.reset(new base::RepeatingTimer());
|
| - timer_->Start(FROM_HERE,
|
| - fetcher_->GetInterval(),
|
| - this, &PollingThread::DoPoll);
|
| + timer_->Start(FROM_HERE, fetcher_->GetInterval(), this,
|
| + &PollingThread::DoPoll);
|
| }
|
| }
|
|
|
| @@ -110,8 +107,7 @@ void DataFetcherSharedMemoryBase::PollingThread::DoPoll() {
|
| // --- end of PollingThread methods
|
|
|
| DataFetcherSharedMemoryBase::DataFetcherSharedMemoryBase()
|
| - : started_consumers_(0) {
|
| -}
|
| + : started_consumers_(0) {}
|
|
|
| DataFetcherSharedMemoryBase::~DataFetcherSharedMemoryBase() {
|
| DCHECK_EQ(0u, started_consumers_);
|
| @@ -204,8 +200,8 @@ void DataFetcherSharedMemoryBase::Fetch(unsigned consumer_bitmask) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -DataFetcherSharedMemoryBase::FetcherType
|
| -DataFetcherSharedMemoryBase::GetType() const {
|
| +DataFetcherSharedMemoryBase::FetcherType DataFetcherSharedMemoryBase::GetType()
|
| + const {
|
| return FETCHER_TYPE_DEFAULT;
|
| }
|
|
|
| @@ -243,4 +239,4 @@ bool DataFetcherSharedMemoryBase::IsPollingTimerRunningForTesting() const {
|
| return polling_thread_ ? polling_thread_->IsTimerRunning() : false;
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace device
|
|
|