Mac: implement orientation/motion shared memory data fetcher.

content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc

Index: content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc
diff --git a/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc b/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc
index b580872859cf68a52d5cb71d97c6899efec72f24..d9b88351a16ad0aaf17b7bb048c900c81b93bfaf 100644
--- a/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc
+++ b/content/browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc
@@ -147,18 +147,20 @@ class FakePollingDataFetcher : public FakeDataFetcher {
   virtual ~FakePollingDataFetcher() { }
 
   virtual bool Start(ConsumerType consumer_type) OVERRIDE {
+    EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop());
     Init(consumer_type);
     start_.Signal();
     return true;
   }
 
   virtual bool Stop(ConsumerType consumer_type) OVERRIDE {
+    EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop());
     stop_.Signal();
     return true;
   }
 
   virtual void Fetch(unsigned consumer_bitmask) OVERRIDE {
-    DCHECK(base::MessageLoop::current() == GetPollingMessageLoop());
+    EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop());
 
     if (consumer_bitmask & CONSUMER_TYPE_ORIENTATION)
       UpdateOrientation();
@@ -179,65 +181,61 @@ class FakePollingDataFetcher : public FakeDataFetcher {
 
 
 TEST(DataFetcherSharedMemoryBaseTest, DoesStartMotion) {
-    FakeNonPollingDataFetcher* mock_data_fetcher =
-      new FakeNonPollingDataFetcher();
-  EXPECT_FALSE(mock_data_fetcher->IsPolling());
+  FakeNonPollingDataFetcher mock_data_fetcher;
+  EXPECT_FALSE(mock_data_fetcher.IsPolling());
 
-  EXPECT_TRUE(mock_data_fetcher->StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
-  mock_data_fetcher->WaitForStart();
+  EXPECT_TRUE(mock_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
+  mock_data_fetcher.WaitForStart();
 
   EXPECT_EQ(kPeriodInMilliseconds,
-      mock_data_fetcher->GetMotionBuffer()->data.interval);
+      mock_data_fetcher.GetMotionBuffer()->data.interval);
 
-  mock_data_fetcher->StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
-  mock_data_fetcher->WaitForStop();
+  mock_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
+  mock_data_fetcher.WaitForStop();
 }
 
 TEST(DataFetcherSharedMemoryBaseTest, DoesStartOrientation) {
-  FakeNonPollingDataFetcher* mock_data_fetcher =
-      new FakeNonPollingDataFetcher();
-  EXPECT_FALSE(mock_data_fetcher->IsPolling());
+  FakeNonPollingDataFetcher mock_data_fetcher;
+  EXPECT_FALSE(mock_data_fetcher.IsPolling());
 
-  EXPECT_TRUE(mock_data_fetcher->StartFetchingDeviceData(
+  EXPECT_TRUE(mock_data_fetcher.StartFetchingDeviceData(
       CONSUMER_TYPE_ORIENTATION));
-  mock_data_fetcher->WaitForStart();
+  mock_data_fetcher.WaitForStart();
 
-  EXPECT_EQ(1, mock_data_fetcher->GetOrientationBuffer()->data.alpha);
+  EXPECT_EQ(1, mock_data_fetcher.GetOrientationBuffer()->data.alpha);
 
-  mock_data_fetcher->StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
-  mock_data_fetcher->WaitForStop();
+  mock_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
+  mock_data_fetcher.WaitForStop();
 }
 
 TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) {
-    FakePollingDataFetcher* mock_data_fetcher =
-      new FakePollingDataFetcher();
-  EXPECT_TRUE(mock_data_fetcher->IsPolling());
+  FakePollingDataFetcher mock_data_fetcher;
+  EXPECT_TRUE(mock_data_fetcher.IsPolling());
 
-  EXPECT_TRUE(mock_data_fetcher->StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
-  mock_data_fetcher->WaitForStart();
-  mock_data_fetcher->WaitForUpdateMotion();
+  EXPECT_TRUE(mock_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION));
+  mock_data_fetcher.WaitForStart();
+  mock_data_fetcher.WaitForUpdateMotion();
 
   EXPECT_EQ(kPeriodInMilliseconds,
-      mock_data_fetcher->GetMotionBuffer()->data.interval);
+      mock_data_fetcher.GetMotionBuffer()->data.interval);
 
-  mock_data_fetcher->StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
-  mock_data_fetcher->WaitForStop();
+  mock_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
+  mock_data_fetcher.WaitForStop();
 }
 
 TEST(DataFetcherSharedMemoryBaseTest, DoesPollOrientation) {
-  FakePollingDataFetcher* mock_data_fetcher =
-      new FakePollingDataFetcher();
-  EXPECT_TRUE(mock_data_fetcher->IsPolling());
+  FakePollingDataFetcher mock_data_fetcher;
+  EXPECT_TRUE(mock_data_fetcher.IsPolling());
 
-  EXPECT_TRUE(mock_data_fetcher->StartFetchingDeviceData(
+  EXPECT_TRUE(mock_data_fetcher.StartFetchingDeviceData(
       CONSUMER_TYPE_ORIENTATION));
-  mock_data_fetcher->WaitForStart();
-  mock_data_fetcher->WaitForUpdateOrientation();
+  mock_data_fetcher.WaitForStart();
+  mock_data_fetcher.WaitForUpdateOrientation();
 
-  EXPECT_EQ(1, mock_data_fetcher->GetOrientationBuffer()->data.alpha);
+  EXPECT_EQ(1, mock_data_fetcher.GetOrientationBuffer()->data.alpha);
 
-  mock_data_fetcher->StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
-  mock_data_fetcher->WaitForStop();
+  mock_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
+  mock_data_fetcher.WaitForStop();
 }
 
 }  // namespace