Refactor GvrDelegate ownership into GvrDelegateProvider and fix more threading violations.

chrome/browser/android/vr_shell/vr_shell_delegate.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_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 
 namespace device {
 class GvrDeviceProvider;
 }
 
 namespace vr_shell {
 
 class NonPresentingGvrDelegate;
 
 class VrShellDelegate : public device::GvrDelegateProvider {
  public:
   VrShellDelegate(JNIEnv* env, jobject obj);
   ~VrShellDelegate() override;
 
-  static VrShellDelegate* GetNativeDelegate(JNIEnv* env, jobject jdelegate);
+  static VrShellDelegate* GetNativeVrShellDelegate(JNIEnv* env,
+                                                   jobject jdelegate);
 
-  void SetDelegate(device::GvrDelegate* delegate);
+  void SetDelegate(device::GvrDelegate* delegate, gvr_context* context);
   void RemoveDelegate();
 
   void SetPresentResult(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         jboolean result);
   void DisplayActivate(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& obj);
   void UpdateVSyncInterval(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>& obj,
                            jlong timebase_nanos, jdouble interval_seconds);
   void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
   void ForceExitVr();
   device::GvrDeviceProvider* device_provider() { return device_provider_; }
   void OnVRVsyncProviderRequest(device::mojom::VRVSyncProviderRequest request);
   base::WeakPtr<VrShellDelegate> GetWeakPtr();
 
  private:
   // device::GvrDelegateProvider implementation
   void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override;
+  void ClearDeviceProvider() override;
   void RequestWebVRPresent(const base::Callback<void(bool)>& callback) override;
   void ExitWebVRPresent() override;
-  device::GvrDelegate* GetNonPresentingDelegate() override;
-  void DestroyNonPresentingDelegate() override;
+  device::GvrDelegate* GetDelegate() override;
   void SetListeningForActivate(bool listening) override;
 
+  void CreateNonPresentingDelegate();
+
   std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_;
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_;
   device::GvrDeviceProvider* device_provider_ = nullptr;
   device::GvrDelegate* delegate_ = nullptr;
   base::Callback<void(bool)> present_callback_;
   long timebase_nanos_ = 0;
   double interval_seconds_ = 0;
 
+  // TODO(mthiesse): Remove the need for this to stored here. crbug.com/674594

[cjgrant, 2017/01/25 21:45:31]

"to be"

[mthiesse, 2017/01/30 19:47:26]

Done.

+  gvr_context* context_ = nullptr;
+
   base::WeakPtrFactory<VrShellDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShellDelegate);
 };
 
 bool RegisterVrShellDelegate(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_