Clean up device_{motion,orientation}_event_pump unittests.

content/renderer/device_sensors/device_orientation_event_pump_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device_orientation_event_pump.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/device_sensors/device_orientation_hardware_buffer.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebDeviceOrientationListener.h"
 
 namespace content {
 
 class MockDeviceOrientationListener
     : public blink::WebDeviceOrientationListener {
  public:
-  MockDeviceOrientationListener();
+  MockDeviceOrientationListener() : did_change_device_orientation_(false) {
+    memset(&data_, 0, sizeof(data_));
+  }
   virtual ~MockDeviceOrientationListener() { }
+
   virtual void didChangeDeviceOrientation(
-      const blink::WebDeviceOrientationData&) OVERRIDE;
-  void ResetDidChangeOrientation();
+      const blink::WebDeviceOrientationData& data) OVERRIDE {
+    memcpy(&data_, &data, sizeof(data));
+    did_change_device_orientation_ = true;
+  }
+
+  bool did_change_device_orientation() const {
+    return did_change_device_orientation_;
+  }
+  void set_did_change_device_orientation(bool value) {
+    did_change_device_orientation_ = value;
+  }
+  const blink::WebDeviceOrientationData& data() const {
+    return data_;
+  }
+
+ private:
   bool did_change_device_orientation_;
   blink::WebDeviceOrientationData data_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockDeviceOrientationListener);
 };
 
-MockDeviceOrientationListener::MockDeviceOrientationListener()
-    : did_change_device_orientation_(false) {
-  memset(&data_, 0, sizeof(data_));
-}
-
-void MockDeviceOrientationListener::didChangeDeviceOrientation(
-    const blink::WebDeviceOrientationData& data) {
-  memcpy(&data_, &data, sizeof(data));
-  did_change_device_orientation_ = true;
-}
-
-void MockDeviceOrientationListener::ResetDidChangeOrientation() {
-  did_change_device_orientation_ = false;
-}
-
 class DeviceOrientationEventPumpForTesting : public DeviceOrientationEventPump {
  public:
   DeviceOrientationEventPumpForTesting() { }
   virtual ~DeviceOrientationEventPumpForTesting() { }
 
   void OnDidStart(base::SharedMemoryHandle renderer_handle) {
     DeviceOrientationEventPump::OnDidStart(renderer_handle);
   }
   virtual bool SendStartMessage() OVERRIDE { return true; }
   virtual bool SendStopMessage() OVERRIDE { return true; }
   virtual void FireEvent() OVERRIDE {
     DeviceOrientationEventPump::FireEvent();
     Stop();
     base::MessageLoop::current()->QuitWhenIdle();
   }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DeviceOrientationEventPumpForTesting);
 };
 
 class DeviceOrientationEventPumpTest : public testing::Test {
  public:
   DeviceOrientationEventPumpTest() {
       EXPECT_TRUE(shared_memory_.CreateAndMapAnonymous(
           sizeof(DeviceOrientationHardwareBuffer)));
   }
 
  protected:
@@ skipping 15 matching lines @@
     data.gamma = 3;
     data.hasGamma = true;
     data.allAvailableSensorsAreActive = true;
   }
 
   void InitBufferNoData() {
     blink::WebDeviceOrientationData& data = buffer_->data;
     data.allAvailableSensorsAreActive = true;
   }
 
+  MockDeviceOrientationListener* listener() { return listener_.get(); }
+  DeviceOrientationEventPumpForTesting* orientation_pump() {
+    return orientation_pump_.get();
+  }
+  base::SharedMemoryHandle handle() { return handle_; }
+  DeviceOrientationHardwareBuffer* buffer() { return buffer_; }
+
+ private:
   scoped_ptr<MockDeviceOrientationListener> listener_;
   scoped_ptr<DeviceOrientationEventPumpForTesting> orientation_pump_;
   base::SharedMemoryHandle handle_;
   base::SharedMemory shared_memory_;
   DeviceOrientationHardwareBuffer* buffer_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceOrientationEventPumpTest);
 };
 
 // Always failing in the win try bot. See http://crbug.com/256782.
 #if defined(OS_WIN)
 #define MAYBE_DidStartPolling DISABLED_DidStartPolling
 #else
 #define MAYBE_DidStartPolling DidStartPolling
 #endif
 TEST_F(DeviceOrientationEventPumpTest, MAYBE_DidStartPolling) {
   base::MessageLoop loop;
 
   InitBuffer();
-  orientation_pump_->SetListener(listener_.get());
-  orientation_pump_->OnDidStart(handle_);
+  orientation_pump()->SetListener(listener());
+  orientation_pump()->OnDidStart(handle());
 
   base::MessageLoop::current()->Run();
 
-  blink::WebDeviceOrientationData& received_data = listener_->data_;
-  EXPECT_TRUE(listener_->did_change_device_orientation_);
+  const blink::WebDeviceOrientationData& received_data = listener()->data();
+  EXPECT_TRUE(listener()->did_change_device_orientation());
   EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
   EXPECT_EQ(1, static_cast<double>(received_data.alpha));
   EXPECT_TRUE(received_data.hasAlpha);
   EXPECT_EQ(2, static_cast<double>(received_data.beta));
   EXPECT_TRUE(received_data.hasBeta);
   EXPECT_EQ(3, static_cast<double>(received_data.gamma));
   EXPECT_TRUE(received_data.hasGamma);
 }
 
 // Always failing in the win try bot. See http://crbug.com/256782.
 #if defined(OS_WIN)
 #define MAYBE_FireAllNullEvent DISABLED_FireAllNullEvent
 #else
 #define MAYBE_FireAllNullEvent FireAllNullEvent
 #endif
 TEST_F(DeviceOrientationEventPumpTest, MAYBE_FireAllNullEvent) {
   base::MessageLoop loop;
 
   InitBufferNoData();
-  orientation_pump_->SetListener(listener_.get());
-  orientation_pump_->OnDidStart(handle_);
+  orientation_pump()->SetListener(listener());
+  orientation_pump()->OnDidStart(handle());
 
   base::MessageLoop::current()->Run();
 
-  blink::WebDeviceOrientationData& received_data = listener_->data_;
-  EXPECT_TRUE(listener_->did_change_device_orientation_);
+  const blink::WebDeviceOrientationData& received_data = listener()->data();
+  EXPECT_TRUE(listener()->did_change_device_orientation());
   EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
   EXPECT_FALSE(received_data.hasAlpha);
   EXPECT_FALSE(received_data.hasBeta);
   EXPECT_FALSE(received_data.hasGamma);
 }
 
 // Always failing in the win try bot. See http://crbug.com/256782.
 #if defined(OS_WIN)
 #define MAYBE_UpdateRespectsOrientationThreshold \
     DISABLED_UpdateRespectsOrientationThreshold
 #else
 #define MAYBE_UpdateRespectsOrientationThreshold \
     UpdateRespectsOrientationThreshold
 #endif
 TEST_F(DeviceOrientationEventPumpTest,
     MAYBE_UpdateRespectsOrientationThreshold) {
   base::MessageLoop loop;
 
   InitBuffer();
-  orientation_pump_->SetListener(listener_.get());
-  orientation_pump_->OnDidStart(handle_);
+  orientation_pump()->SetListener(listener());
+  orientation_pump()->OnDidStart(handle());
 
   base::MessageLoop::current()->Run();
 
-  blink::WebDeviceOrientationData& received_data = listener_->data_;
-  EXPECT_TRUE(listener_->did_change_device_orientation_);
+  const blink::WebDeviceOrientationData& received_data = listener()->data();
+  EXPECT_TRUE(listener()->did_change_device_orientation());
   EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
   EXPECT_EQ(1, static_cast<double>(received_data.alpha));
   EXPECT_TRUE(received_data.hasAlpha);
   EXPECT_EQ(2, static_cast<double>(received_data.beta));
   EXPECT_TRUE(received_data.hasBeta);
   EXPECT_EQ(3, static_cast<double>(received_data.gamma));
   EXPECT_TRUE(received_data.hasGamma);
 
-  buffer_->data.alpha =
+  buffer()->data.alpha =
       1 + DeviceOrientationEventPump::kOrientationThreshold / 2.0;
-  listener_->ResetDidChangeOrientation();
+  listener()->set_did_change_device_orientation(false);
 
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&DeviceOrientationEventPumpForTesting::FireEvent,
-                 base::Unretained(orientation_pump_.get())));
+                 base::Unretained(orientation_pump())));
   base::MessageLoop::current()->Run();
 
-  EXPECT_FALSE(listener_->did_change_device_orientation_);
+  EXPECT_FALSE(listener()->did_change_device_orientation());
   EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
   EXPECT_EQ(1, static_cast<double>(received_data.alpha));
   EXPECT_TRUE(received_data.hasAlpha);
   EXPECT_EQ(2, static_cast<double>(received_data.beta));
   EXPECT_TRUE(received_data.hasBeta);
   EXPECT_EQ(3, static_cast<double>(received_data.gamma));
   EXPECT_TRUE(received_data.hasGamma);
 
-  buffer_->data.alpha =
+  buffer()->data.alpha =
       1 + DeviceOrientationEventPump::kOrientationThreshold;
-  listener_->ResetDidChangeOrientation();
+  listener()->set_did_change_device_orientation(false);
 
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&DeviceOrientationEventPumpForTesting::FireEvent,
-                 base::Unretained(orientation_pump_.get())));
+                 base::Unretained(orientation_pump())));
   base::MessageLoop::current()->Run();
 
-  EXPECT_TRUE(listener_->did_change_device_orientation_);
+  EXPECT_TRUE(listener()->did_change_device_orientation());
   EXPECT_EQ(1 + DeviceOrientationEventPump::kOrientationThreshold,
       static_cast<double>(received_data.alpha));
 }
 
 }  // namespace content