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

chrome/browser/android/vr_shell/vr_shell.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_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 90 matching lines @@
   void SubmitWebVRFrame() override;
   void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
                                 const gvr::Rectf& right_bounds) override;
   gvr::GvrApi* gvr_api() override;
   void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override;
   void SetWebVRRenderSurfaceSize(int width, int height) override;
   gvr::Sizei GetWebVRCompositorSurfaceSize() override;
 
   void SurfacesChanged(jobject content_surface, jobject ui_surface);
   void GvrDelegateReady();
+  void AppButtonPressed();
 
   void ContentBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width, jint height, jfloat dpr);
 
   void UIBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width, jint height, jfloat dpr);
 
   // Called from non-render thread to queue a callback onto the render thread.
   // The render thread checks for callbacks and processes them between frames.
   void QueueTask(base::Callback<void()>& callback);
 
   // Perform a UI action triggered by the javascript API.
   void DoUiAction(const UiAction action);
 
   void SetContentCssSize(float width, float height, float dpr);
   void SetUiCssSize(float width, float height, float dpr);
 
   void ContentFrameWasResized(bool width_changed);
 
   void ForceExitVR();
 
  private:
   ~VrShell() override;
   void SetShowingOverscrollGlow(bool showing_glow);
+  void PostToGlThreadWhenReady(const base::Closure& task);
 
   // content::WebContentsObserver implementation. All called on UI thread.
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override;
   void MainFrameWasResized(bool width_changed) override;
   void WebContentsDestroyed() override;
 
   std::unique_ptr<UiInterface> html_interface_;
 
   std::unique_ptr<VrCompositor> content_compositor_;
@@ skipping 16 matching lines @@
   base::WeakPtrFactory<VrShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_