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

content/browser/device_sensors/device_sensor_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
+#include "device/generic_sensor/platform_sensor.h"
+#include "device/generic_sensor/platform_sensor_provider.h"
 #include "device/sensors/data_fetcher_shared_memory.h"
 #include "device/sensors/device_sensor_service.h"
 #include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
 #include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
 
 namespace content {
 
 namespace {
 
 class FakeDataFetcher : public device::DataFetcherSharedMemory {
  public:
   FakeDataFetcher() : sensor_data_available_(true) {}
   ~FakeDataFetcher() override {}
 
-  void SetMotionStartedCallback(base::Closure motion_started_callback) {
-    motion_started_callback_ = motion_started_callback;
-  }
-
-  void SetMotionStoppedCallback(base::Closure motion_stopped_callback) {
-    motion_stopped_callback_ = motion_stopped_callback;
-  }
-
   void SetOrientationStartedCallback(
       base::Closure orientation_started_callback) {
     orientation_started_callback_ = orientation_started_callback;
   }
 
   void SetOrientationStoppedCallback(
       base::Closure orientation_stopped_callback) {
     orientation_stopped_callback_ = orientation_stopped_callback;
   }
 
   void SetOrientationAbsoluteStartedCallback(
       base::Closure orientation_absolute_started_callback) {
     orientation_absolute_started_callback_ =
         orientation_absolute_started_callback;
   }
 
   void SetOrientationAbsoluteStoppedCallback(
       base::Closure orientation_absolute_stopped_callback) {
     orientation_absolute_stopped_callback_ =
         orientation_absolute_stopped_callback;
   }
 
   bool Start(device::ConsumerType consumer_type, void* buffer) override {
     EXPECT_TRUE(buffer);
 
     switch (consumer_type) {
-      case device::CONSUMER_TYPE_MOTION: {
-        device::DeviceMotionHardwareBuffer* motion_buffer =
-            static_cast<device::DeviceMotionHardwareBuffer*>(buffer);
-        if (sensor_data_available_)
-          UpdateMotion(motion_buffer);
-        SetMotionBufferReady(motion_buffer);
-        BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                                motion_started_callback_);
-      } break;
       case device::CONSUMER_TYPE_ORIENTATION: {
         device::DeviceOrientationHardwareBuffer* orientation_buffer =
             static_cast<device::DeviceOrientationHardwareBuffer*>(buffer);
         if (sensor_data_available_)
           UpdateOrientation(orientation_buffer);
         SetOrientationBufferReady(orientation_buffer);
         BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                                 orientation_started_callback_);
       } break;
       case device::CONSUMER_TYPE_ORIENTATION_ABSOLUTE: {
         device::DeviceOrientationHardwareBuffer* orientation_buffer =
             static_cast<device::DeviceOrientationHardwareBuffer*>(buffer);
         if (sensor_data_available_)
           UpdateOrientationAbsolute(orientation_buffer);
         SetOrientationBufferReady(orientation_buffer);
         BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                                 orientation_absolute_started_callback_);
       } break;
       default:
         return false;
     }
     return true;
   }
 
   bool Stop(device::ConsumerType consumer_type) override {
     switch (consumer_type) {
-      case device::CONSUMER_TYPE_MOTION:
-        BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                                motion_stopped_callback_);
-        break;
       case device::CONSUMER_TYPE_ORIENTATION:
         BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                                 orientation_stopped_callback_);
         break;
       case device::CONSUMER_TYPE_ORIENTATION_ABSOLUTE:
         BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                                 orientation_absolute_stopped_callback_);
         break;
       default:
         return false;
     }
     return true;
   }
 
   void Fetch(unsigned consumer_bitmask) override {
     FAIL() << "fetch should not be called";
   }
 
   FetcherType GetType() const override { return FETCHER_TYPE_DEFAULT; }
 
   void SetSensorDataAvailable(bool available) {
     sensor_data_available_ = available;
   }
 
-  void SetMotionBufferReady(device::DeviceMotionHardwareBuffer* buffer) {
-    buffer->seqlock.WriteBegin();
-    buffer->data.all_available_sensors_are_active = true;
-    buffer->seqlock.WriteEnd();
-  }
-
   void SetOrientationBufferReady(
       device::DeviceOrientationHardwareBuffer* buffer) {
     buffer->seqlock.WriteBegin();
     buffer->data.all_available_sensors_are_active = true;
     buffer->seqlock.WriteEnd();
   }
 
-  void UpdateMotion(device::DeviceMotionHardwareBuffer* buffer) {
-    buffer->seqlock.WriteBegin();
-    buffer->data.acceleration_x = 1;
-    buffer->data.has_acceleration_x = true;
-    buffer->data.acceleration_y = 2;
-    buffer->data.has_acceleration_y = true;
-    buffer->data.acceleration_z = 3;
-    buffer->data.has_acceleration_z = true;
-
-    buffer->data.acceleration_including_gravity_x = 4;
-    buffer->data.has_acceleration_including_gravity_x = true;
-    buffer->data.acceleration_including_gravity_y = 5;
-    buffer->data.has_acceleration_including_gravity_y = true;
-    buffer->data.acceleration_including_gravity_z = 6;
-    buffer->data.has_acceleration_including_gravity_z = true;
-
-    buffer->data.rotation_rate_alpha = 7;
-    buffer->data.has_rotation_rate_alpha = true;
-    buffer->data.rotation_rate_beta = 8;
-    buffer->data.has_rotation_rate_beta = true;
-    buffer->data.rotation_rate_gamma = 9;
-    buffer->data.has_rotation_rate_gamma = true;
-
-    buffer->data.interval = 100;
-    buffer->data.all_available_sensors_are_active = true;
-    buffer->seqlock.WriteEnd();
-  }
-
   void UpdateOrientation(device::DeviceOrientationHardwareBuffer* buffer) {
     buffer->seqlock.WriteBegin();
     buffer->data.alpha = 1;
     buffer->data.has_alpha = true;
     buffer->data.beta = 2;
     buffer->data.has_beta = true;
     buffer->data.gamma = 3;
     buffer->data.has_gamma = true;
     buffer->data.all_available_sensors_are_active = true;
     buffer->seqlock.WriteEnd();
   }
 
   void UpdateOrientationAbsolute(
       device::DeviceOrientationHardwareBuffer* buffer) {
     buffer->seqlock.WriteBegin();
     buffer->data.alpha = 4;
     buffer->data.has_alpha = true;
     buffer->data.beta = 5;
     buffer->data.has_beta = true;
     buffer->data.gamma = 6;
     buffer->data.has_gamma = true;
     buffer->data.absolute = true;
     buffer->data.all_available_sensors_are_active = true;
     buffer->seqlock.WriteEnd();
   }
 
   // The below callbacks should be run on the UI thread.
-  base::Closure motion_started_callback_;
   base::Closure orientation_started_callback_;
   base::Closure orientation_absolute_started_callback_;
-  base::Closure motion_stopped_callback_;
   base::Closure orientation_stopped_callback_;
   base::Closure orientation_absolute_stopped_callback_;
   bool sensor_data_available_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeDataFetcher);
 };
 
+class FakeAccelerometerSensor : public device::PlatformSensor {

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

"meter" means "sensor", just call it a FakeAccelerometer.

[juncai, 2017/05/30 22:26:56]

Done.

+ public:
+  FakeAccelerometerSensor(device::mojom::SensorType type,
+                          mojo::ScopedSharedBufferMapping mapping,
+                          device::PlatformSensorProvider* provider)
+      : PlatformSensor(type, std::move(mapping), provider) {}

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

type -> device::mojom::SensorType::ACCELEROMETER

[juncai, 2017/05/30 22:26:57]

Done.

+
+  device::mojom::ReportingMode GetReportingMode() override {
+    return device::mojom::ReportingMode::ON_CHANGE;
+  }
+
+  bool StartSensor(
+      const device::PlatformSensorConfiguration& configuration) override {
+    device::SensorReading reading;
+    reading.timestamp =
+        (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+    reading.values[0] = 4;
+    reading.values[1] = 5;
+    reading.values[2] = 6;
+    UpdateSensorReading(reading, true);
+    return true;
+  }
+
+  void StopSensor() override{};

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

nit: space before {

[juncai, 2017/05/30 22:26:56]

There was a space between {, but it's odd that "git cl format" removes the
space.

Done.

+
+ protected:
+  ~FakeAccelerometerSensor() override = default;
+
+  bool CheckSensorConfiguration(
+      const device::PlatformSensorConfiguration& configuration) override {
+    return true;
+  }
+
+  device::PlatformSensorConfiguration GetDefaultConfiguration() override {
+    device::PlatformSensorConfiguration default_configuration;
+    default_configuration.set_frequency(60);
+    return default_configuration;

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

return device::PlatformSensorConfiguration(60 /* frequency */);

[juncai, 2017/05/30 22:26:56]

Done.

+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FakeAccelerometerSensor);
+};
+
+class FakeLinearAccelerationSensor : public device::PlatformSensor {
+ public:
+  FakeLinearAccelerationSensor(device::mojom::SensorType type,
+                               mojo::ScopedSharedBufferMapping mapping,
+                               device::PlatformSensorProvider* provider)
+      : PlatformSensor(type, std::move(mapping), provider) {}

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

type -> device::mojom::SensorType::LINEAR_ACCELERATION

[juncai, 2017/05/30 22:26:56]

Done.

+
+  device::mojom::ReportingMode GetReportingMode() override {
+    return device::mojom::ReportingMode::CONTINUOUS;
+  }
+
+  bool StartSensor(
+      const device::PlatformSensorConfiguration& configuration) override {
+    device::SensorReading reading;
+    reading.timestamp =
+        (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+    reading.values[0] = 1;
+    reading.values[1] = 2;
+    reading.values[2] = 3;
+    UpdateSensorReading(reading, true);
+    return true;
+  }
+
+  void StopSensor() override{};
+
+ protected:
+  ~FakeLinearAccelerationSensor() override = default;
+
+  bool CheckSensorConfiguration(
+      const device::PlatformSensorConfiguration& configuration) override {
+    return true;
+  }
+
+  device::PlatformSensorConfiguration GetDefaultConfiguration() override {
+    device::PlatformSensorConfiguration default_configuration;
+    default_configuration.set_frequency(60);
+    return default_configuration;

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

return device::PlatformSensorConfiguration(60 /* frequency */);

[juncai, 2017/05/30 22:26:57]

Done.

+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FakeLinearAccelerationSensor);
+};
+
+class FakeGyroscopeSensor : public device::PlatformSensor {

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

"scope" also means "sensor", so just call it a FakeGyroscope.

[juncai, 2017/05/30 22:26:56]

Done.

+ public:
+  FakeGyroscopeSensor(device::mojom::SensorType type,
+                      mojo::ScopedSharedBufferMapping mapping,
+                      device::PlatformSensorProvider* provider)
+      : PlatformSensor(type, std::move(mapping), provider) {}

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

type -> device::mojom::SensorType::GYROSCOPE

[juncai, 2017/05/30 22:26:56]

Done.

+
+  device::mojom::ReportingMode GetReportingMode() override {
+    return device::mojom::ReportingMode::ON_CHANGE;
+  }
+
+  bool StartSensor(
+      const device::PlatformSensorConfiguration& configuration) override {
+    device::SensorReading reading;
+    reading.timestamp =
+        (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+    reading.values[0] = 7;
+    reading.values[1] = 8;
+    reading.values[2] = 9;
+    UpdateSensorReading(reading, true);
+    return true;
+  }
+
+  void StopSensor() override{};
+
+ protected:
+  ~FakeGyroscopeSensor() override = default;
+
+  bool CheckSensorConfiguration(
+      const device::PlatformSensorConfiguration& configuration) override {
+    return true;
+  }
+
+  device::PlatformSensorConfiguration GetDefaultConfiguration() override {
+    device::PlatformSensorConfiguration default_configuration;
+    default_configuration.set_frequency(60);
+    return default_configuration;

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

return device::PlatformSensorConfiguration(60 /* frequency */);

[juncai, 2017/05/30 22:26:56]

Done.

+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FakeGyroscopeSensor);
+};
+
+class FakeSensorProvider : public device::PlatformSensorProvider {
+ public:
+  static FakeSensorProvider* GetInstance() {
+    return base::Singleton<FakeSensorProvider, base::LeakySingletonTraits<
+                                                   FakeSensorProvider>>::get();
+  }
+  FakeSensorProvider()
+      : accelerometer_sensor_is_available_(true),
+        linear_acceleration_sensor_is_available_(true),
+        gyroscope_sensor_is_available_(true) {}
+  ~FakeSensorProvider() override = default;
+
+  void set_accelerometer_sensor_is_available(
+      bool accelerometer_sensor_is_available) {
+    accelerometer_sensor_is_available_ = accelerometer_sensor_is_available;
+  }
+
+  void set_linear_acceleration_sensor_is_available(
+      bool linear_acceleration_sensor_is_available) {
+    linear_acceleration_sensor_is_available_ =
+        linear_acceleration_sensor_is_available;
+  }
+
+  void set_gyroscope_sensor_is_available(bool gyroscope_sensor_is_available) {
+    gyroscope_sensor_is_available_ = gyroscope_sensor_is_available;
+  }
+
+ protected:
+  void CreateSensorInternal(device::mojom::SensorType type,
+                            mojo::ScopedSharedBufferMapping mapping,
+                            const CreateSensorCallback& callback) override {
+    // Create Sensors here.
+    switch (type) {
+      case device::mojom::SensorType::ACCELEROMETER: {
+        if (accelerometer_sensor_is_available_) {
+          scoped_refptr<device::PlatformSensor> sensor =
+              new FakeAccelerometerSensor(type, std::move(mapping), this);
+          callback.Run(std::move(sensor));
+        } else {
+          callback.Run(nullptr);
+        }
+        break;
+      }
+      case device::mojom::SensorType::LINEAR_ACCELERATION: {
+        if (linear_acceleration_sensor_is_available_) {
+          scoped_refptr<device::PlatformSensor> sensor =
+              new FakeLinearAccelerationSensor(type, std::move(mapping), this);
+          callback.Run(std::move(sensor));
+        } else {
+          callback.Run(nullptr);
+        }
+        break;
+      }
+      case device::mojom::SensorType::GYROSCOPE: {
+        if (gyroscope_sensor_is_available_) {
+          scoped_refptr<device::PlatformSensor> sensor =
+              new FakeGyroscopeSensor(type, std::move(mapping), this);
+          callback.Run(std::move(sensor));
+        } else {
+          callback.Run(nullptr);
+        }
+        break;
+      }
+      default:
+        NOTIMPLEMENTED();
+        callback.Run(nullptr);
+    }

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

scoped_refptr<device::PlatformSensor> sensor;

switch (type) {
  case device::mojom::SensorType::ACCELEROMETER:
    if (accelerometer_is_available_)
      sensor = new FakeAccelerometer(std::move(mapping), this);
    break;
  case device::mojom::SensorType::LINEAR_ACCELERATION:
    if (linear_acceleration_sensor_is_available_)
      sensor = new FakeLinearAccelerationSensor(std::move(mapping), this);
    break;
  case device::mojom::SensorType::GYROSCOPE:
    if (gyroscope_is_available_)
      sensor = new FakeGyroscope(std::move(mapping), this);
    break;
  default:
    NOTIMPLEMENTED();
}

callback.Run(std::move(sensor));

[juncai, 2017/05/30 22:26:56]

Done.

+  }
+
+  bool accelerometer_sensor_is_available_;
+  bool linear_acceleration_sensor_is_available_;
+  bool gyroscope_sensor_is_available_;

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

bool accelerometer_is_available_;
bool linear_acceleration_sensor_is_available_;
bool gyroscope_is_available_;

[juncai, 2017/05/30 22:26:57]

Done.

+};
+
 class DeviceSensorBrowserTest : public ContentBrowserTest {
  public:
   DeviceSensorBrowserTest()
       : fetcher_(nullptr),
         io_loop_finished_event_(
             base::WaitableEvent::ResetPolicy::AUTOMATIC,
             base::WaitableEvent::InitialState::NOT_SIGNALED) {}
 
   void SetUpOnMainThread() override {
     // Initialize the RunLoops now that the main thread has been created.
-    motion_started_runloop_.reset(new base::RunLoop());
-    motion_stopped_runloop_.reset(new base::RunLoop());
     orientation_started_runloop_.reset(new base::RunLoop());
     orientation_stopped_runloop_.reset(new base::RunLoop());
     orientation_absolute_started_runloop_.reset(new base::RunLoop());
     orientation_absolute_stopped_runloop_.reset(new base::RunLoop());
 #if defined(OS_ANDROID)
     // On Android, the DeviceSensorService lives on the UI thread.
     SetUpFetcher();
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&DeviceSensorBrowserTest::SetUpOnIOThreadForAndroid,
+                   base::Unretained(this)));
+    io_loop_finished_event_.Wait();
 #else
     // On all other platforms, the DeviceSensorService lives on the IO thread.
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&DeviceSensorBrowserTest::SetUpOnIOThread,
                    base::Unretained(this)));
     io_loop_finished_event_.Wait();
 #endif
   }
 
   void SetUpFetcher() {
     fetcher_ = new FakeDataFetcher();
-    fetcher_->SetMotionStartedCallback(motion_started_runloop_->QuitClosure());
-    fetcher_->SetMotionStoppedCallback(motion_stopped_runloop_->QuitClosure());
     fetcher_->SetOrientationStartedCallback(
         orientation_started_runloop_->QuitClosure());
     fetcher_->SetOrientationStoppedCallback(
         orientation_stopped_runloop_->QuitClosure());
     fetcher_->SetOrientationAbsoluteStartedCallback(
         orientation_absolute_started_runloop_->QuitClosure());
     fetcher_->SetOrientationAbsoluteStoppedCallback(
         orientation_absolute_stopped_runloop_->QuitClosure());
     device::DeviceSensorService::GetInstance()->SetDataFetcherForTesting(
         fetcher_);
   }
 
+  void SetUpOnIOThreadForAndroid() {

[Reilly Grant (use Gerrit), 2017/05/27 03:17:50]

This is the same as SetUpOnIOThread().

[juncai, 2017/05/30 22:26:57]

It doesn't have the SetUpFetcher().

[Reilly Grant (use Gerrit), 2017/06/06 20:58:55]

It would be easier to read if you put the call to SetUpFetcher() inside an #if
defined(OS_ANDROID) instead of duplicating all the other code with this small
difference.

[juncai, 2017/06/06 23:36:25]

Done.

+    sensor_provider_ = FakeSensorProvider::GetInstance();
+    device::PlatformSensorProvider::SetProviderForTesting(sensor_provider_);
+    io_loop_finished_event_.Signal();
+  }
+
   void SetUpOnIOThread() {
     SetUpFetcher();
+    sensor_provider_ = FakeSensorProvider::GetInstance();
+    device::PlatformSensorProvider::SetProviderForTesting(sensor_provider_);
     io_loop_finished_event_.Signal();
   }
 
+  void TearDown() override {
+    device::PlatformSensorProvider::SetProviderForTesting(nullptr);
+  }
+
   void DelayAndQuit(base::TimeDelta delay) {
     base::PlatformThread::Sleep(delay);
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void WaitForAlertDialogAndQuitAfterDelay(base::TimeDelta delay) {
     ShellJavaScriptDialogManager* dialog_manager =
         static_cast<ShellJavaScriptDialogManager*>(
             shell()->GetJavaScriptDialogManager(shell()->web_contents()));
 
     scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner();
     dialog_manager->set_dialog_request_callback(
         base::Bind(&DeviceSensorBrowserTest::DelayAndQuit,
                    base::Unretained(this), delay));
     runner->Run();
   }
 
   FakeDataFetcher* fetcher_;
+  FakeSensorProvider* sensor_provider_;
 
   // NOTE: These can only be initialized once the main thread has been created
   // and so must be pointers instead of plain objects.
-  std::unique_ptr<base::RunLoop> motion_started_runloop_;
-  std::unique_ptr<base::RunLoop> motion_stopped_runloop_;
   std::unique_ptr<base::RunLoop> orientation_started_runloop_;
   std::unique_ptr<base::RunLoop> orientation_stopped_runloop_;
   std::unique_ptr<base::RunLoop> orientation_absolute_started_runloop_;
   std::unique_ptr<base::RunLoop> orientation_absolute_stopped_runloop_;
 
  private:
   base::WaitableEvent io_loop_finished_event_;
 };
 
 IN_PROC_BROWSER_TEST_F(DeviceSensorBrowserTest, OrientationTest) {
@@ skipping 22 matching lines @@
 }
 
 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
   // provided.
   fetcher_->SetSensorDataAvailable(false);
   GURL test_url =
       GetTestUrl("device_sensors", "device_orientation_null_test.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
@@ skipping 14 matching lines @@
 
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
   orientation_absolute_started_runloop_->Run();
   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);
+  sensor_provider_->set_accelerometer_sensor_is_available(false);
+  sensor_provider_->set_linear_acceleration_sensor_is_available(false);
+  sensor_provider_->set_gyroscope_sensor_is_available(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,
+                       MotionOnlySomeSensorsAreAvailableTest) {
+  // The test page registers an event handler for motion events and
+  // expects to get an event with only some fake values, because only
+  // some sensor data can be provided.
+  sensor_provider_->set_accelerometer_sensor_is_available(false);
+  GURL test_url =
+      GetTestUrl("device_sensors",
+                 "device_motion_only_some_sensors_are_available_test.html");
+  NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
+
+  EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 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
   // dialog with a delay to test that the one-off null-events still propagate to
   // window after the alert is dismissed and the callbacks are invoked which
   // eventually navigate to #pass.
   fetcher_->SetSensorDataAvailable(false);
+  sensor_provider_->set_accelerometer_sensor_is_available(false);
+  sensor_provider_->set_linear_acceleration_sensor_is_available(false);
+  sensor_provider_->set_gyroscope_sensor_is_available(false);
   TestNavigationObserver same_tab_observer(shell()->web_contents(), 2);
 
   GURL test_url =
       GetTestUrl("device_sensors", "device_sensors_null_test_with_alert.html");
   shell()->LoadURL(test_url);
 
   // TODO(timvolodine): investigate if it is possible to test this without
   // 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();
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content