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

chrome/browser/android/vr_shell/vr_shell_delegate.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_delegate.h"
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "jni/VrShellDelegate_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::AttachCurrentThread;
 
 namespace vr_shell {
 
 // A non presenting delegate for magic window mode.
 class GvrNonPresentingDelegate : public device::GvrDelegate {
  public:
-  explicit GvrNonPresentingDelegate(jlong context) : weak_ptr_factory_(this) {
+  explicit GvrNonPresentingDelegate(jlong context) {
     gvr_api_ =
         gvr::GvrApi::WrapNonOwned(reinterpret_cast<gvr_context*>(context));
   }
 
   virtual ~GvrNonPresentingDelegate() = default;
 
   // GvrDelegate implementation
   void SetWebVRSecureOrigin(bool secure_origin) override {}
   void SubmitWebVRFrame() override {}
   void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
                                 const gvr::Rectf& right_bounds) override {}
   void SetGvrPoseForWebVr(const gvr::Mat4f& pose,
                           uint32_t pose_index) override {}
   void SetWebVRRenderSurfaceSize(int width, int height) override {}
   gvr::Sizei GetWebVRCompositorSurfaceSize() override {
     return device::kInvalidRenderTargetSize; }
   gvr::GvrApi* gvr_api() override { return gvr_api_.get(); }
-  base::WeakPtr<GvrNonPresentingDelegate> GetWeakPtr() {
-    return weak_ptr_factory_.GetWeakPtr();
-  }
  private:
   std::unique_ptr<gvr::GvrApi> gvr_api_;
-  base::WeakPtrFactory<GvrNonPresentingDelegate> weak_ptr_factory_;
 };
 
-VrShellDelegate::VrShellDelegate(JNIEnv* env, jobject obj)
-    : device_provider_(nullptr) {
+VrShellDelegate::VrShellDelegate(JNIEnv* env, jobject obj) {
   j_vr_shell_delegate_.Reset(env, obj);
   GvrDelegateProvider::SetInstance(this);
 }
 
 VrShellDelegate::~VrShellDelegate() {
   GvrDelegateProvider::SetInstance(nullptr);
+  if (device_provider_) {
+    device_provider_->OnNonPresentingDelegateRemoved();
+  }
 }
 
 VrShellDelegate* VrShellDelegate::GetNativeDelegate(
     JNIEnv* env, jobject jdelegate) {
   long native_delegate = Java_VrShellDelegate_getNativePointer(env, jdelegate);
   return reinterpret_cast<VrShellDelegate*>(native_delegate);
 }
 
-void VrShellDelegate::SetDelegate(
-    const base::WeakPtr<device::GvrDelegate>& delegate) {
+void VrShellDelegate::SetDelegate(device::GvrDelegate* delegate) {
   // TODO(mthiesse): There's no reason for this delegate to be a WeakPtr
   // anymore.
   delegate_ = delegate;
-  if (device_provider_.get()) {
+  if (device_provider_) {
     device_provider_->OnGvrDelegateReady(delegate_);
   }
 }
 
 void VrShellDelegate::RemoveDelegate() {
-  delegate_.reset();
-  if (device_provider_.get()) {
+  if (device_provider_) {
     device_provider_->OnGvrDelegateRemoved();
   }
+  delegate_ = nullptr;
 }
 
 void VrShellDelegate::SetPresentResult(JNIEnv* env, jobject obj,
                                        jboolean result) {
   CHECK(!present_callback_.is_null());
   present_callback_.Run(result);
   present_callback_.Reset();
 }
 
 void VrShellDelegate::DisplayActivate(JNIEnv* env, jobject obj) {
   if (device_provider_) {
     device_provider_->OnDisplayActivate();
   }
 }
 
 void VrShellDelegate::SetDeviceProvider(
-    base::WeakPtr<device::GvrDeviceProvider> device_provider) {
+    device::GvrDeviceProvider* device_provider) {
   device_provider_ = device_provider;
-  if (delegate_.get()) {
+  if (device_provider_ && delegate_) {
     device_provider_->OnGvrDelegateReady(delegate_);
   }
 }
 
 void VrShellDelegate::RequestWebVRPresent(
     const base::Callback<void(bool)>& callback) {
   if (!present_callback_.is_null()) {
     // Can only handle one request at a time. This is also extremely unlikely to
     // happen in practice.
     callback.Run(false);
@@ skipping 12 matching lines @@
   // being used elsewhere.
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_exitWebVR(env, j_vr_shell_delegate_.obj());
 }
 
 void VrShellDelegate::ForceExitVr() {
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_forceExitVr(env, j_vr_shell_delegate_.obj());
 }
 
-base::WeakPtr<device::GvrDelegate> VrShellDelegate::GetNonPresentingDelegate() {
+device::GvrDelegate* VrShellDelegate::GetNonPresentingDelegate() {
   if (!non_presenting_delegate_) {
     JNIEnv* env = AttachCurrentThread();
     jlong context = Java_VrShellDelegate_createNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
     if (!context)
       return nullptr;
 
     non_presenting_delegate_.reset(new GvrNonPresentingDelegate(context));
   }
-  return static_cast<GvrNonPresentingDelegate*>(non_presenting_delegate_.get())
-      ->GetWeakPtr();
+  return static_cast<GvrNonPresentingDelegate*>(non_presenting_delegate_.get());
 }
 
 void VrShellDelegate::DestroyNonPresentingDelegate() {
   if (non_presenting_delegate_) {
     non_presenting_delegate_.reset(nullptr);
     JNIEnv* env = AttachCurrentThread();
     Java_VrShellDelegate_shutdownNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
   }
 }
@@ skipping 10 matching lines @@
 
 bool RegisterVrShellDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj));
 }
 
 }  // namespace vr_shell