Refactor GvrDelegate ownership into GvrDelegateProvider and fix more threading violations.

chrome/browser/android/vr_shell/non_presenting_gvr_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_NON_PRESENTING_GVR_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_NON_PRESENTING_GVR_DELEGATE_H_
 
 #include <jni.h>
 
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/vr_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 
 // A non presenting delegate for magic window mode.
 class NonPresentingGvrDelegate : public device::GvrDelegate,
                                  public device::mojom::VRVSyncProvider {
  public:
-  explicit NonPresentingGvrDelegate(long context);
+  explicit NonPresentingGvrDelegate(gvr_context* context);
 
   ~NonPresentingGvrDelegate() override;
 
   // GvrDelegate implementation
   void SetWebVRSecureOrigin(bool secure_origin) override {}
   void SubmitWebVRFrame() override {}
   void UpdateWebVRTextureBounds(int16_t frame_index,
                                 const gvr::Rectf& left_bounds,
                                 const gvr::Rectf& right_bounds) override {}
-  void SetWebVRRenderSurfaceSize(int width, int height) override {}
-  gvr::Sizei GetWebVRCompositorSurfaceSize() override;
-  gvr::GvrApi* gvr_api() override;
   void OnVRVsyncProviderRequest(
       device::mojom::VRVSyncProviderRequest request) override;
   void UpdateVSyncInterval(long timebase_nanos,
                            double interval_seconds) override;
+  bool SupportsPresentation() override;
+  void ResetPose() override;
+  void CreateVRDisplayInfo(
+      const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
+      uint32_t device_id) override;
 
   void Pause();
   void Resume();
   device::mojom::VRVSyncProviderRequest OnSwitchToPresentingDelegate();
 
  private:
   void StopVSyncLoop();
   void StartVSyncLoop();
   void OnVSync();
   void SendVSync(base::TimeDelta time, const GetVSyncCallback& callback);
@@ skipping 14 matching lines @@
   GetVSyncCallback callback_;
   mojo::Binding<device::mojom::VRVSyncProvider> binding_;
   base::WeakPtrFactory<NonPresentingGvrDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NonPresentingGvrDelegate);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_NON_PRESENTING_GVR_DELEGATE_H_