Refactor GvrDelegate ownership into GvrDelegateProvider and fix more threading violations.

chrome/browser/android/vr_shell/vr_shell_gl.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 "chrome/browser/android/vr_shell/vr_shell_gl.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/callback_helpers.h"
@@ skipping 136 matching lines @@
   CARDBOARD = 1,
   DAYDREAM = 2,
   VIEWER_TYPE_MAX,
 };
 
 int64_t TimeInMicroseconds() {
   return std::chrono::duration_cast<std::chrono::microseconds>(
       std::chrono::steady_clock::now().time_since_epoch()).count();
 }
 
+void RunVRDisplayInfoCallback(
+    const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
+    device::mojom::VRDisplayInfoPtr info) {
+  callback.Run(std::move(info));
+}
+
 }  // namespace
 
 VrShellGl::VrShellGl(
     const base::WeakPtr<VrShell>& weak_vr_shell,
     const base::WeakPtr<VrShellDelegate>& delegate_provider,
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
     gvr_context* gvr_api,
     bool initially_web_vr,
     bool reprojected_rendering)
       : web_vr_mode_(initially_web_vr),
@@ skipping 772 matching lines @@
                                          const gvr::Rectf& right_bounds) {
   if (frame_index < 0) {
     webvr_left_viewport_->SetSourceUv(left_bounds);
     webvr_right_viewport_->SetSourceUv(right_bounds);
   } else {
     pending_bounds_.emplace(
         std::make_pair(frame_index, std::make_pair(left_bounds, right_bounds)));
   }
 }
 
-gvr::GvrApi* VrShellGl::gvr_api() {
-  return gvr_api_.get();
-}
-
 void VrShellGl::ContentBoundsChanged(int width, int height) {
   TRACE_EVENT0("gpu", "VrShellGl::ContentBoundsChanged");
   content_tex_css_width_ = width;
   content_tex_css_height_ = height;
 }
 
 void VrShellGl::ContentPhysicalBoundsChanged(int width, int height) {
   if (content_surface_texture_.get())
     content_surface_texture_->SetDefaultBufferSize(width, height);
   content_tex_physical_size_.width = width;
@@ skipping 87 matching lines @@
 
   gvr::Mat4f head_mat =
       gvr_api_->GetHeadSpaceFromStartSpaceRotation(target_time);
   head_mat = gvr_api_->ApplyNeckModel(head_mat, 1.0f);
 
   webvr_head_pose_[frame_index % kPoseRingBufferSize] = head_mat;
 
   callback.Run(VrShell::VRPosePtrFromGvrPose(head_mat), time, frame_index);
 }
 
+void VrShellGl::ResetPose() {
+  // Should never call RecenterTracking when using with Daydream viewers. On
+  // those devices recentering should only be done via the controller.
+  if (gvr_api_ && gvr_api_->GetViewerType() == GVR_VIEWER_TYPE_CARDBOARD)
+    gvr_api_->RecenterTracking();
+}
+
+void VrShellGl::CreateVRDisplayInfo(
+    const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
+    uint32_t device_id) {
+  device::mojom::VRDisplayInfoPtr info = VrShell::CreateVRDisplayInfo(
+      gvr_api_.get(), content_tex_physical_size_, device_id);
+  main_thread_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&RunVRDisplayInfoCallback, callback, base::Passed(&info)));
+}
+
 }  // namespace vr_shell