Clean up some VrShell threading issues and remove unnecessary WeakPtr types.

chrome/browser/android/vr_shell/vr_shell_gl.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
 
 #include <memory>
 
 #include "base/cancelable_callback.h"
@@ skipping 30 matching lines @@
 // It is not threadsafe and must only be used on the GL thread.
 class VrShellGl {
  public:
   enum class InputTarget {
     NONE = 0,
     CONTENT,
     UI
   };
 
   VrShellGl(
-      VrShell* vr_shell,
       const base::WeakPtr<VrShell>& weak_vr_shell,
       const base::WeakPtr<VrInputManager>& content_input_manager,
       const base::WeakPtr<VrInputManager>& ui_input_manager,
       scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
-      gvr_context* gvr_api);
+      gvr_context* gvr_api,
+      bool initially_web_vr);
   ~VrShellGl();
 
   bool Initialize();
 
   void DrawFrame();
 
   void OnTriggerEvent();
   void OnPause();
   void OnResume();
 
@@ skipping 90 matching lines @@
   int content_tex_css_height_ = 0;
   gvr::Sizei content_tex_physical_size_ = {0, 0};
   gvr::Sizei ui_tex_physical_size_ = {0, 0};
 
   // The pose ring buffer size must be a power of two to avoid glitches when
   // the pose index wraps around. It should be large enough to handle the
   // current backlog of poses which is 2-3 frames.
   static constexpr int kPoseRingBufferSize = 8;
   std::vector<gvr::Mat4f> webvr_head_pose_;
   std::vector<bool> webvr_head_pose_valid_;
-  jint webvr_texture_id_ = 0;
+  int webvr_texture_id_ = 0;
+  bool web_vr_mode_;
 
   std::unique_ptr<VrController> controller_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::CancelableClosure draw_task_;
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 
-  // TODO(mthiesse): Remove thread-unsafe VrShell usage.
-  VrShell* vr_shell_;
   base::WeakPtr<VrShell> weak_vr_shell_;
   base::WeakPtr<VrInputManager> content_input_manager_;
   base::WeakPtr<VrInputManager> ui_input_manager_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShellGl);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_