Tracks GVR version crossed with headset type using UMA.

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 <utility>
 
 #include "base/android/jni_android.h"
 #include "base/callback_helpers.h"
 #include "chrome/browser/android/vr_shell/non_presenting_gvr_delegate.h"
+#include "chrome/browser/android/vr_shell/vr_metrics_util.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/android/gvr/gvr_device.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "jni/VrShellDelegate_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::AttachCurrentThread;
+using base::android::ScopedJavaLocalRef;
 
 namespace vr_shell {
 
 VrShellDelegate::VrShellDelegate(JNIEnv* env, jobject obj)
     : weak_ptr_factory_(this) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
   j_vr_shell_delegate_.Reset(env, obj);
 }
 
 VrShellDelegate::~VrShellDelegate() {
   DVLOG(1) << __FUNCTION__ << "=" << this;
   if (device_provider_) {
     device_provider_->Device()->OnExitPresent();
     device_provider_->Device()->OnDelegateChanged();
   }
   if (!present_callback_.is_null()) {
     base::ResetAndReturn(&present_callback_).Run(false);
   }
 }
 
 device::GvrDelegateProvider* VrShellDelegate::CreateVrShellDelegate() {
   JNIEnv* env = AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jobject> jdelegate =
-      Java_VrShellDelegate_getInstance(env);
+  ScopedJavaLocalRef<jobject> jdelegate = Java_VrShellDelegate_getInstance(env);
   if (!jdelegate.is_null())
     return GetNativeVrShellDelegate(env, jdelegate.obj());
   return nullptr;
 }
 
 VrShellDelegate* VrShellDelegate::GetNativeVrShellDelegate(JNIEnv* env,
                                                            jobject jdelegate) {
   return reinterpret_cast<VrShellDelegate*>(
       Java_VrShellDelegate_getNativePointer(env, jdelegate));
 }
 
 void VrShellDelegate::SetPresentingDelegate(
     device::PresentingGvrDelegate* delegate,
     gvr_context* context) {
   presenting_delegate_ = delegate;
   // Clean up the non-presenting delegate.
+  JNIEnv* env = AttachCurrentThread();
   if (presenting_delegate_ && non_presenting_delegate_) {
     non_presenting_delegate_ = nullptr;
-    JNIEnv* env = AttachCurrentThread();
     Java_VrShellDelegate_shutdownNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
   }
   if (device_provider_) {
     device::GvrDevice* device = device_provider_->Device();
     device->OnDelegateChanged();
   }
 
   presenting_delegate_->UpdateVSyncInterval(timebase_nanos_, interval_seconds_);
 
   if (pending_successful_present_request_) {
     presenting_delegate_->SetSubmitClient(std::move(submit_client_));
     base::ResetAndReturn(&present_callback_).Run(true);
     pending_successful_present_request_ = false;
   }
+
+  auto vr_core_info = MakeVrCoreInfo(env);

[mthiesse, 2017/05/24 05:47:26]

nit: Only use auto when the type is apparent. I don't think it is in this case.

[tiborg, 2017/05/25 00:06:03]

Done.

+  VrMetricsUtil::LogGvrVersionForVrViewerType(context, *vr_core_info);
 }
 
 void VrShellDelegate::RemoveDelegate() {
   presenting_delegate_ = nullptr;
   if (device_provider_) {
     CreateNonPresentingDelegate();
     device_provider_->Device()->OnExitPresent();
     device_provider_->Device()->OnDelegateChanged();
   }
 }
@@ skipping 103 matching lines @@
   // VRShell is no longer needed by WebVR, allow it to shut down if it's not
   // being used elsewhere.
   JNIEnv* env = AttachCurrentThread();
   if (Java_VrShellDelegate_exitWebVRPresent(env, j_vr_shell_delegate_.obj())) {
     if (device_provider_) {
       device_provider_->Device()->OnExitPresent();
     }
   }
 }
 
+jlong VrShellDelegate::MakeNativeVrCoreInfo(JNIEnv* env,

[mthiesse, 2017/05/24 05:47:26]

I think you should move this function into (a new) vr_core_info.cc, and call it
Init to match the pattern other places use. (Then expose this function through
VrCoreInfo.java instead of VrShellDelegate)

[tiborg, 2017/05/25 00:06:03]

Done.

+                                            const JavaParamRef<jobject>& obj,
+                                            jint major_version,
+                                            jint minor_version,
+                                            jint patch_version,
+                                            jint compatibility) {
+  return reinterpret_cast<intptr_t>(
+      new VrCoreInfo(major_version, minor_version, patch_version,
+                     static_cast<VrCoreCompatibility>(compatibility)));
+}
+
+std::unique_ptr<VrCoreInfo> VrShellDelegate::MakeVrCoreInfo(JNIEnv* env) {
+  std::unique_ptr<VrCoreInfo> vr_core_info =
+      std::unique_ptr<VrCoreInfo>(reinterpret_cast<VrCoreInfo*>(

[mthiesse, 2017/05/24 05:47:26]

This is pretty confusing. I think you probably want to use base::WrapUnique on
the VrCoreInfo*?

[tiborg, 2017/05/25 00:06:03]

Done.

+          Java_VrShellDelegate_getVrCoreInfo(env, j_vr_shell_delegate_.obj())));
+  return vr_core_info;
+}
+
 void VrShellDelegate::CreateNonPresentingDelegate() {
   JNIEnv* env = AttachCurrentThread();
   gvr_context* context = reinterpret_cast<gvr_context*>(
       Java_VrShellDelegate_createNonPresentingNativeContext(
           env, j_vr_shell_delegate_.obj()));
   non_presenting_delegate_ =
       base::MakeUnique<NonPresentingGvrDelegate>(context);
   non_presenting_delegate_->UpdateVSyncInterval(timebase_nanos_,
                                                 interval_seconds_);
+  auto vr_core_info = MakeVrCoreInfo(env);
+  VrMetricsUtil::LogGvrVersionForVrViewerType(context, *vr_core_info);
 }
 
 void VrShellDelegate::OnActivateDisplayHandled(bool present_requested) {
   if (!present_requested) {
     // WebVR page didn't request presentation in the vrdisplayactivate handler.
     // Tell VrShell that we are in VR Browsing Mode.
     ExitWebVRPresent();
   }
 }
 
@@ skipping 20 matching lines @@
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj));
 }
 
 static void OnLibraryAvailable(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   device::GvrDelegateProvider::SetInstance(
       base::Bind(&VrShellDelegate::CreateVrShellDelegate));
 }
 
 }  // namespace vr_shell