Migrate SensorProviderProxy to use GC mojo wrappers.

No behavior change. This CL reduces potential risks of use-after-free bugs.

Bug: 1049056
Change-Id: Ie9d5865ff5be6203eadb71687a37b501cea51540
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109576Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Commit-Queue: Minoru Chikamune <chikamune@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755272}

third_party/blink/renderer/modules/sensor/sensor_provider_proxy.cc

@@ -13,14 +13,17 @@ namespace blink {
 
 // SensorProviderProxy
 SensorProviderProxy::SensorProviderProxy(Document& document)
-    : Supplement<Document>(document), inspector_mode_(false) {}
+    : Supplement<Document>(document),
+      sensor_provider_(document.ToExecutionContext()),
+      inspector_mode_(false) {}
 
 void SensorProviderProxy::InitializeIfNeeded() {
   if (IsInitialized())
     return;
 
   GetSupplementable()->GetBrowserInterfaceBroker().GetInterface(
-      sensor_provider_.BindNewPipeAndPassReceiver());
+      sensor_provider_.BindNewPipeAndPassReceiver(
+          GetSupplementable()->GetTaskRunner(TaskType::kSensor)));
   sensor_provider_.set_disconnect_handler(
       WTF::Bind(&SensorProviderProxy::OnSensorProviderConnectionError,
                 WrapWeakPersistent(this)));
@@ -46,6 +49,7 @@ SensorProviderProxy::~SensorProviderProxy() = default;
 
 void SensorProviderProxy::Trace(Visitor* visitor) {
   visitor->Trace(sensor_proxies_);
+  visitor->Trace(sensor_provider_);
   Supplement<Document>::Trace(visitor);
 }
 

third_party/blink/renderer/modules/sensor/sensor_provider_proxy.h

@@ -6,12 +6,13 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_SENSOR_SENSOR_PROVIDER_PROXY_H_
 
 #include "base/macros.h"
-#include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/sensor.mojom-blink-forward.h"
 #include "services/device/public/mojom/sensor_provider.mojom-blink.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
+#include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
+#include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 
 namespace blink {
@@ -58,7 +59,9 @@ class MODULES_EXPORT SensorProviderProxy final
   void OnSensorProviderConnectionError();
   SensorsSet sensor_proxies_;
 
-  mojo::Remote<device::mojom::blink::SensorProvider> sensor_provider_;
+  HeapMojoRemote<device::mojom::blink::SensorProvider,
+                 HeapMojoWrapperMode::kWithoutContextObserver>
+      sensor_provider_;
   bool inspector_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(SensorProviderProxy);