| Index: content/renderer/device_orientation/device_orientation_event_pump_unittest.cc
|
| diff --git a/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc b/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc
|
| index e1f568b27e9dec60955f4627e62d1109788ca573..402cd0775686288e8268a613bfac08f0276fcfe8 100644
|
| --- a/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc
|
| +++ b/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc
|
| @@ -14,15 +14,15 @@
|
| namespace content {
|
|
|
| class MockDeviceOrientationListener
|
| - : public WebKit::WebDeviceOrientationListener {
|
| + : public blink::WebDeviceOrientationListener {
|
| public:
|
| MockDeviceOrientationListener();
|
| virtual ~MockDeviceOrientationListener() { }
|
| virtual void didChangeDeviceOrientation(
|
| - const WebKit::WebDeviceOrientationData&) OVERRIDE;
|
| + const blink::WebDeviceOrientationData&) OVERRIDE;
|
| void ResetDidChangeOrientation();
|
| bool did_change_device_orientation_;
|
| - WebKit::WebDeviceOrientationData data_;
|
| + blink::WebDeviceOrientationData data_;
|
| };
|
|
|
| MockDeviceOrientationListener::MockDeviceOrientationListener()
|
| @@ -31,7 +31,7 @@ MockDeviceOrientationListener::MockDeviceOrientationListener()
|
| }
|
|
|
| void MockDeviceOrientationListener::didChangeDeviceOrientation(
|
| - const WebKit::WebDeviceOrientationData& data) {
|
| + const blink::WebDeviceOrientationData& data) {
|
| memcpy(&data_, &data, sizeof(data));
|
| did_change_device_orientation_ = true;
|
| }
|
| @@ -75,7 +75,7 @@ class DeviceOrientationEventPumpTest : public testing::Test {
|
| }
|
|
|
| void InitBuffer() {
|
| - WebKit::WebDeviceOrientationData& data = buffer_->data;
|
| + blink::WebDeviceOrientationData& data = buffer_->data;
|
| data.alpha = 1;
|
| data.hasAlpha = true;
|
| data.beta = 2;
|
| @@ -107,7 +107,7 @@ TEST_F(DeviceOrientationEventPumpTest, MAYBE_DidStartPolling) {
|
|
|
| base::MessageLoop::current()->Run();
|
|
|
| - WebKit::WebDeviceOrientationData& received_data = listener_->data_;
|
| + blink::WebDeviceOrientationData& received_data = listener_->data_;
|
| EXPECT_TRUE(listener_->did_change_device_orientation_);
|
| EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
|
| EXPECT_EQ(1, (double)received_data.alpha);
|
| @@ -136,7 +136,7 @@ TEST_F(DeviceOrientationEventPumpTest,
|
|
|
| base::MessageLoop::current()->Run();
|
|
|
| - WebKit::WebDeviceOrientationData& received_data = listener_->data_;
|
| + blink::WebDeviceOrientationData& received_data = listener_->data_;
|
| EXPECT_TRUE(listener_->did_change_device_orientation_);
|
| EXPECT_TRUE(received_data.allAvailableSensorsAreActive);
|
| EXPECT_EQ(1, (double)received_data.alpha);
|
|
|