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

content/shell/test_runner/test_runner.cc

Index: content/shell/test_runner/test_runner.cc
diff --git a/content/shell/test_runner/test_runner.cc b/content/shell/test_runner/test_runner.cc
index c21435d517627f0a910fdd62dfbdc283a1e744f4..2fe286fd354150131890b1c2bd29e453e8f2bfff 100644
--- a/content/shell/test_runner/test_runner.cc
+++ b/content/shell/test_runner/test_runner.cc
@@ -32,7 +32,6 @@
 #include "content/shell/test_runner/test_runner_for_specific_view.h"
 #include "content/shell/test_runner/web_test_delegate.h"
 #include "content/shell/test_runner/web_view_test_proxy.h"
-#include "device/sensors/public/cpp/motion_data.h"
 #include "device/sensors/public/cpp/orientation_data.h"
 #include "gin/arguments.h"
 #include "gin/array_buffer.h"
@@ -44,6 +43,7 @@
 #include "third_party/WebKit/public/platform/WebPasswordCredential.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 #include "third_party/WebKit/public/web/WebArrayBuffer.h"
 #include "third_party/WebKit/public/web/WebArrayBufferConverter.h"
@@ -2218,7 +2218,7 @@ void TestRunner::SetMockDeviceMotion(bool has_acceleration_x,
                                      bool has_rotation_rate_gamma,
                                      double rotation_rate_gamma,
                                      double interval) {
-  device::MotionData motion;
+  blink::WebDeviceMotionData motion;
 
   // acceleration
   motion.has_acceleration_x = has_acceleration_x;