| Index: device/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc b/device/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| similarity index 91%
|
| rename from content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| rename to device/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| index e13cd8986c64d01244aa7940a357190e15374526..0bf5def88bce8b06b382b3523ba35bb1eeecbf3d 100644
|
| --- a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| +++ b/device/device_sensors/data_fetcher_shared_memory_base_unittest.cc
|
| @@ -2,15 +2,15 @@
|
| // 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/device_sensors/data_fetcher_shared_memory_base.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/process/process_handle.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| -#include "content/common/device_sensors/device_light_hardware_buffer.h"
|
| -#include "content/common/device_sensors/device_motion_hardware_buffer.h"
|
| -#include "content/common/device_sensors/device_orientation_hardware_buffer.h"
|
| +#include "device/device_sensors/device_light_hardware_buffer.h"
|
| +#include "device/device_sensors/device_motion_hardware_buffer.h"
|
| +#include "device/device_sensors/device_orientation_hardware_buffer.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace content {
|
| @@ -83,9 +83,7 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
|
|
|
| DeviceLightHardwareBuffer* GetLightBuffer() const { return light_buffer_; }
|
|
|
| - DeviceMotionHardwareBuffer* GetMotionBuffer() const {
|
| - return motion_buffer_;
|
| - }
|
| + DeviceMotionHardwareBuffer* GetMotionBuffer() const { return motion_buffer_; }
|
|
|
| DeviceOrientationHardwareBuffer* GetOrientationBuffer() const {
|
| return orientation_buffer_;
|
| @@ -154,7 +152,7 @@ class FakeDataFetcher : public DataFetcherSharedMemoryBase {
|
|
|
| class FakeNonPollingDataFetcher : public FakeDataFetcher {
|
| public:
|
| - FakeNonPollingDataFetcher() { }
|
| + FakeNonPollingDataFetcher() {}
|
| ~FakeNonPollingDataFetcher() override {}
|
|
|
| bool Start(ConsumerType consumer_type, void* buffer) override {
|
| @@ -197,7 +195,7 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher {
|
|
|
| void Fetch(unsigned consumer_bitmask) override {
|
| FAIL() << "fetch should not be called, "
|
| - << "because this is a non-polling fetcher";
|
| + << "because this is a non-polling fetcher";
|
| }
|
|
|
| FetcherType GetType() const override { return FakeDataFetcher::GetType(); }
|
| @@ -208,7 +206,7 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher {
|
|
|
| class FakePollingDataFetcher : public FakeDataFetcher {
|
| public:
|
| - FakePollingDataFetcher() { }
|
| + FakePollingDataFetcher() {}
|
| ~FakePollingDataFetcher() override {}
|
|
|
| bool Start(ConsumerType consumer_type, void* buffer) override {
|
| @@ -272,7 +270,7 @@ class FakePollingDataFetcher : public FakeDataFetcher {
|
|
|
| class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher {
|
| public:
|
| - FakeZeroDelayPollingDataFetcher() { }
|
| + FakeZeroDelayPollingDataFetcher() {}
|
| ~FakeZeroDelayPollingDataFetcher() override {}
|
|
|
| bool Start(ConsumerType consumer_type, void* buffer) override {
|
| @@ -328,11 +326,10 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher {
|
| DISALLOW_COPY_AND_ASSIGN(FakeZeroDelayPollingDataFetcher);
|
| };
|
|
|
| -
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesStartMotion) {
|
| FakeNonPollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION);
|
| @@ -347,10 +344,10 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesStartMotion) {
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesStartOrientation) {
|
| FakeNonPollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(
|
| - CONSUMER_TYPE_ORIENTATION));
|
| + EXPECT_TRUE(
|
| + fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION);
|
|
|
| EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha);
|
| @@ -376,7 +373,7 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesStartLight) {
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) {
|
| FakePollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION);
|
| @@ -392,10 +389,10 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) {
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesPollOrientation) {
|
| FakePollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(
|
| - CONSUMER_TYPE_ORIENTATION));
|
| + EXPECT_TRUE(
|
| + fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION);
|
| fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_ORIENTATION);
|
|
|
| @@ -423,17 +420,16 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollLight) {
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotionAndOrientation) {
|
| FakePollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(
|
| - CONSUMER_TYPE_ORIENTATION));
|
| + EXPECT_TRUE(
|
| + fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION));
|
| base::SharedMemoryHandle handle_orientation =
|
| fake_data_fetcher.GetSharedMemoryHandleForProcess(
|
| CONSUMER_TYPE_ORIENTATION, base::GetCurrentProcessHandle());
|
| EXPECT_TRUE(base::SharedMemory::IsHandleValid(handle_orientation));
|
|
|
| - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(
|
| - CONSUMER_TYPE_MOTION));
|
| + EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
|
| base::SharedMemoryHandle handle_motion =
|
| fake_data_fetcher.GetSharedMemoryHandleForProcess(
|
| CONSUMER_TYPE_MOTION, base::GetCurrentProcessHandle());
|
| @@ -458,10 +454,10 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotionAndOrientation) {
|
| TEST(DataFetcherSharedMemoryBaseTest, DoesNotPollZeroDelay) {
|
| FakeZeroDelayPollingDataFetcher fake_data_fetcher;
|
| EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_SEPARATE_THREAD,
|
| - fake_data_fetcher.GetType());
|
| + fake_data_fetcher.GetType());
|
|
|
| - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(
|
| - CONSUMER_TYPE_ORIENTATION));
|
| + EXPECT_TRUE(
|
| + fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION));
|
| fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION);
|
|
|
| EXPECT_FALSE(fake_data_fetcher.IsPollingTimerRunningForTesting());
|
| @@ -471,7 +467,6 @@ TEST(DataFetcherSharedMemoryBaseTest, DoesNotPollZeroDelay) {
|
| fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION);
|
| }
|
|
|
| -
|
| } // namespace
|
|
|
| } // namespace content
|
|
|