Refactor content/renderer/device_sensors to use device/generic_sensor instead of device/sensors

content/shell/test_runner/web_test_delegate.h

Index: content/shell/test_runner/web_test_delegate.h
diff --git a/content/shell/test_runner/web_test_delegate.h b/content/shell/test_runner/web_test_delegate.h
index 845889ce6da1c1c026341f248e1a5a7556152f28..0e409dddf981de7b3017a71429d8487c4b6430f8 100644
--- a/content/shell/test_runner/web_test_delegate.h
+++ b/content/shell/test_runner/web_test_delegate.h
@@ -23,6 +23,8 @@ class DictionaryValue;
 }
 
 namespace blink {
+class WebDeviceMotionData;
+class WebDeviceOrientationData;
 class WebFrame;
 class WebInputEvent;
 class WebLocalFrame;
@@ -39,11 +41,6 @@ namespace cc {
 class SharedBitmapManager;
 }
 
-namespace device {
-class MotionData;
-class OrientationData;
-}
-
 namespace test_runner {
 
 class GamepadController;
@@ -64,11 +61,11 @@ class WebTestDelegate {
 
   // Set data to return when registering via
   // Platform::setDeviceMotionListener().
-  virtual void SetDeviceMotionData(const device::MotionData& data) = 0;
+  virtual void SetDeviceMotionData(const blink::WebDeviceMotionData& data) = 0;
   // Set data to return when registering via
   // Platform::setDeviceOrientationListener().
   virtual void SetDeviceOrientationData(
-      const device::OrientationData& data) = 0;
+      const blink::WebDeviceOrientationData& data) = 0;
 
   // Add a message to stderr (not saved to expected output files, for debugging
   // only).