Migrate DeviceSensorEntry to the new Mojo types

This CL converts old Mojo types to the new types
in DeviceSensorEntry.

 - Replace mojo::Binding with mojo::Receiver
 - Apply mojo::Remote into SensorPtr

Bug: 983396
Change-Id: I5a6153c4046a6cef5b98d73dd723d7e1fcb955a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1757422Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#689276}

third_party/blink/renderer/modules/device_orientation/device_sensor_entry.cc

@@ -17,7 +17,7 @@ DeviceSensorEntry::DeviceSensorEntry(DeviceSensorEventPump* event_pump,
     : event_pump_(event_pump), type_(type) {}
 
 void DeviceSensorEntry::Dispose() {
-  client_binding_.Close();
+  client_receiver_.reset();
 }
 
 DeviceSensorEntry::~DeviceSensorEntry() = default;
@@ -30,7 +30,7 @@ void DeviceSensorEntry::Start(
                                WTF::Bind(&DeviceSensorEntry::OnSensorCreated,
                                          WrapWeakPersistent(this)));
   } else if (state_ == State::SUSPENDED) {
-    sensor_->Resume();
+    sensor_remote_->Resume();
     state_ = State::ACTIVE;
     event_pump_->DidStartIfPossible();
   } else if (state_ == State::SHOULD_SUSPEND) {
@@ -46,8 +46,8 @@ void DeviceSensorEntry::Start(
 }
 
 void DeviceSensorEntry::Stop() {
-  if (sensor_) {
-    sensor_->Suspend();
+  if (sensor_remote_) {
+    sensor_remote_->Suspend();
     state_ = State::SUSPENDED;
   } else if (state_ == State::INITIALIZING) {
     // When the sensor needs to be suspended, and it is still in the
@@ -61,7 +61,7 @@ void DeviceSensorEntry::Stop() {
 }
 
 bool DeviceSensorEntry::IsConnected() const {
-  return sensor_.is_bound();
+  return sensor_remote_.is_bound();
 }
 
 bool DeviceSensorEntry::ReadyOrErrored() const {
@@ -71,7 +71,7 @@ bool DeviceSensorEntry::ReadyOrErrored() const {
 }
 
 bool DeviceSensorEntry::GetReading(device::SensorReading* reading) {
-  if (!sensor_)
+  if (!sensor_remote_)
     return false;
 
   DCHECK(shared_buffer_reader_);
@@ -118,8 +118,8 @@ void DeviceSensorEntry::OnSensorCreated(
 
   DCHECK_EQ(0u, params->buffer_offset % kReadBufferSize);
 
-  sensor_.Bind(std::move(params->sensor));
-  client_binding_.Bind(std::move(params->client_request));
+  sensor_remote_.Bind(std::move(params->sensor));
+  client_receiver_.Bind(std::move(params->client_request));
 
   shared_buffer_reader_ = device::SensorReadingSharedBufferReader::Create(
       std::move(params->memory), params->buffer_offset);
@@ -135,10 +135,10 @@ void DeviceSensorEntry::OnSensorCreated(
       static_cast<double>(DeviceSensorEventPump::kDefaultPumpFrequencyHz),
       params->maximum_frequency);
 
-  sensor_.set_connection_error_handler(WTF::Bind(
+  sensor_remote_.set_disconnect_handler(WTF::Bind(
       &DeviceSensorEntry::HandleSensorError, WrapWeakPersistent(this)));
-  sensor_->ConfigureReadingChangeNotifications(/*enabled=*/false);
-  sensor_->AddConfiguration(
+  sensor_remote_->ConfigureReadingChangeNotifications(/*enabled=*/false);
+  sensor_remote_->AddConfiguration(
       std::move(config), WTF::Bind(&DeviceSensorEntry::OnSensorAddConfiguration,
                                    WrapWeakPersistent(this)));
 }
@@ -151,16 +151,16 @@ void DeviceSensorEntry::OnSensorAddConfiguration(bool success) {
     state_ = State::ACTIVE;
     event_pump_->DidStartIfPossible();
   } else if (state_ == State::SHOULD_SUSPEND) {
-    sensor_->Suspend();
+    sensor_remote_->Suspend();
     state_ = State::SUSPENDED;
   }
 }
 
 void DeviceSensorEntry::HandleSensorError() {
-  sensor_.reset();
+  sensor_remote_.reset();
   state_ = State::NOT_INITIALIZED;
   shared_buffer_reader_.reset();
-  client_binding_.Close();
+  client_receiver_.reset();
 }
 
 }  // namespace blink

third_party/blink/renderer/modules/device_orientation/device_sensor_entry.h

@@ -5,7 +5,8 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DEVICE_ORIENTATION_DEVICE_SENSOR_ENTRY_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_DEVICE_ORIENTATION_DEVICE_SENSOR_ENTRY_H_
 
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/sensor.mojom-blink.h"
 #include "services/device/public/mojom/sensor_provider.mojom-blink.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
@@ -74,8 +75,8 @@ class DeviceSensorEntry : public GarbageCollectedFinalized<DeviceSensorEntry>,
 
   State state_ = State::NOT_INITIALIZED;
 
-  device::mojom::blink::SensorPtr sensor_;
-  mojo::Binding<device::mojom::blink::SensorClient> client_binding_{this};
+  mojo::Remote<device::mojom::blink::Sensor> sensor_remote_;
+  mojo::Receiver<device::mojom::blink::SensorClient> client_receiver_{this};
 
   device::mojom::blink::SensorType type_;