Reland: Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors

content/test/layouttest_support.cc

Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index dff10a62dfdd3c68b87582b536b6fa0c0f596575..132efac34c48a79491c66de41e8b3bb029632615 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -41,13 +41,13 @@
 #include "content/shell/test_runner/web_frame_test_proxy.h"
 #include "content/shell/test_runner/web_view_test_proxy.h"
 #include "content/shell/test_runner/web_widget_test_proxy.h"
-#include "device/sensors/public/cpp/motion_data.h"
 #include "device/sensors/public/cpp/orientation_data.h"
 #include "gpu/ipc/service/image_transport_surface.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ -67,7 +67,6 @@
 #include "ui/gfx/win/direct_write.h"
 #endif
 
-using device::MotionData;
 using device::OrientationData;
 using blink::WebRect;
 using blink::WebSize;
@@ -269,7 +268,7 @@ void SetMockGamepadProvider(std::unique_ptr<RendererGamepadProvider> provider) {
                                            std::move(provider));
 }
 
-void SetMockDeviceMotionData(const MotionData& data) {
+void SetMockDeviceMotionData(const blink::WebDeviceMotionData& data) {
   RendererBlinkPlatformImpl::SetMockDeviceMotionDataForTesting(data);
 }