Refactor GvrDelegate ownership into GvrDelegateProvider and fix more threading violations.

device/vr/vr_display_impl.cc

 // Copyright 2016 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 <utility>
 
 #include "base/bind.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_service_impl.h"
 
 namespace device {
 
 VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service)
     : binding_(this),
       device_(device),
       service_(service),
       weak_ptr_factory_(this) {
-  mojom::VRDisplayInfoPtr display_info = device->GetVRDevice();
-  if (service->client()) {
-    service->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
-                                          mojo::MakeRequest(&client_),
-                                          std::move(display_info));
+  base::Callback<void(mojom::VRDisplayInfoPtr)> callback = base::Bind(
+      &VRDisplayImpl::OnVRDisplayInfoCreated, weak_ptr_factory_.GetWeakPtr());
+  device->GetVRDevice(callback);
+}
+
+void VRDisplayImpl::OnVRDisplayInfoCreated(
+    mojom::VRDisplayInfoPtr display_info) {
+  if (service_->client()) {
+    service_->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
+                                           mojo::MakeRequest(&client_),
+                                           std::move(display_info));
   }
 }
 
 VRDisplayImpl::~VRDisplayImpl() {
   device_->RemoveDisplay(this);
 }
 
 void VRDisplayImpl::ResetPose() {
   if (!device_->IsAccessAllowed(this))
     return;
@@ skipping 44 matching lines @@
                              std::move(right_bounds));
 }
 
 void VRDisplayImpl::GetVRVSyncProvider(mojom::VRVSyncProviderRequest request) {
   if (!device_->IsAccessAllowed(this)) {
     return;
   }
   device_->GetVRVSyncProvider(std::move(request));
 }
 }