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

content/browser/device_sensors/device_sensor_browsertest.cc

Index: content/browser/device_sensors/device_sensor_browsertest.cc
diff --git a/content/browser/device_sensors/device_sensor_browsertest.cc b/content/browser/device_sensors/device_sensor_browsertest.cc
index ef16d3810c34451a599a2cac2b32b964eb30b8e7..4e2bc2b5bb5c27e7edf07e3eb5892f1eee9637ad 100644
--- a/content/browser/device_sensors/device_sensor_browsertest.cc
+++ b/content/browser/device_sensors/device_sensor_browsertest.cc
@@ -315,18 +315,6 @@ IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, OrientationAbsoluteTest) {
   orientation_absolute_stopped_runloop_->Run();
 }
 
-IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, MotionTest) {
-  // The test page will register an event handler for motion events,
-  // expects to get an event with fake values, then removes the event
-  // handler and navigates to #pass.
-  GURL test_url = GetTestUrl("device_sensors", "device_motion_test.html");
-  NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
-
-  EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
-  motion_started_runloop_->Run();
-  motion_stopped_runloop_->Run();
-}
-
 IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, OrientationNullTest) {
   // The test page registers an event handler for orientation events and
   // expects to get an event with null values, because no sensor data can be
@@ -355,19 +343,6 @@ IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, OrientationAbsoluteNullTest) {
   orientation_absolute_stopped_runloop_->Run();
 }
 
-IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, MotionNullTest) {
-  // The test page registers an event handler for motion events and
-  // expects to get an event with null values, because no sensor data can be
-  // provided.
-  fetcher_->SetSensorDataAvailable(false);
-  GURL test_url = GetTestUrl("device_sensors", "device_motion_null_test.html");
-  NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
-
-  EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
-  motion_started_runloop_->Run();
-  motion_stopped_runloop_->Run();
-}
-
 IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, NullTestWithAlert) {
   // The test page registers an event handlers for motion/orientation events and
   // expects to get events with null values. The test raises a modal alert
@@ -385,8 +360,6 @@ IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, NullTestWithAlert) {
   // delay, crbug.com/360044.
   WaitForAlertDialogAndQuitAfterDelay(base::TimeDelta::FromMilliseconds(500));
 
-  motion_started_runloop_->Run();
-  motion_stopped_runloop_->Run();
   orientation_started_runloop_->Run();
   orientation_stopped_runloop_->Run();
   same_tab_observer.Wait();