Migrate ContactsManager to use GC mojo wrappers.

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

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

third_party/blink/renderer/modules/contacts_picker/contacts_manager.cc

@@ -100,18 +100,20 @@ constexpr char kIcon[] = "icon";
 
 }  // namespace
 
-ContactsManager::ContactsManager() = default;
+ContactsManager::ContactsManager() : contacts_manager_(nullptr) {}
 
 ContactsManager::~ContactsManager() = default;
 
-mojo::Remote<mojom::blink::ContactsManager>&
-ContactsManager::GetContactsManager(ScriptState* script_state) {
-  if (!contacts_manager_) {
+mojom::blink::ContactsManager* ContactsManager::GetContactsManager(
+    ScriptState* script_state) {
+  if (!contacts_manager_.is_bound()) {
     ExecutionContext::From(script_state)
         ->GetBrowserInterfaceBroker()
-        .GetInterface(contacts_manager_.BindNewPipeAndPassReceiver());
+        .GetInterface(contacts_manager_.BindNewPipeAndPassReceiver(
+            ExecutionContext::From(script_state)
+                ->GetTaskRunner(TaskType::kMiscPlatformAPI)));
   }
-  return contacts_manager_;
+  return contacts_manager_.get();
 }
 
 const Vector<String>& ContactsManager::GetProperties(
@@ -231,4 +233,9 @@ ScriptPromise ContactsManager::getProperties(ScriptState* script_state) {
                              ToV8(GetProperties(script_state), script_state));
 }
 
+void ContactsManager::Trace(Visitor* visitor) {
+  visitor->Trace(contacts_manager_);
+  ScriptWrappable::Trace(visitor);
+}
+
 }  // namespace blink

third_party/blink/renderer/modules/contacts_picker/contacts_manager.h

@@ -5,12 +5,13 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CONTACTS_PICKER_CONTACTS_MANAGER_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_CONTACTS_PICKER_CONTACTS_MANAGER_H_
 
-#include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/mojom/contacts/contacts_manager.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_contacts_select_options.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/thread_state.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/wtf/vector.h"
 
 namespace blink {
@@ -34,9 +35,10 @@ class ContactsManager final : public ScriptWrappable {
                        ExceptionState& exception_state);
   ScriptPromise getProperties(ScriptState* script_state);
 
+  void Trace(Visitor*) override;
+
  private:
-  mojo::Remote<mojom::blink::ContactsManager>& GetContactsManager(
-      ScriptState* script_state);
+  mojom::blink::ContactsManager* GetContactsManager(ScriptState* script_state);
 
   void OnContactsSelected(
       ScriptPromiseResolver* resolver,
@@ -45,7 +47,9 @@ class ContactsManager final : public ScriptWrappable {
   const Vector<String>& GetProperties(ScriptState* script_state);
 
   // Created lazily.
-  mojo::Remote<mojom::blink::ContactsManager> contacts_manager_;
+  HeapMojoRemote<mojom::blink::ContactsManager,
+                 HeapMojoWrapperMode::kWithoutContextObserver>
+      contacts_manager_;
   bool contact_picker_in_use_ = false;
   Vector<String> properties_;
 };