Revert "Stop sending XRDeviceId with VRDisplayInfo"

This reverts commit 67468f66.

Reason for revert: causes win-chrome builds to fail:
[10171/23886] CXX obj/device/vr/vr/oculus_device.obj
FAILED: obj/device/vr/vr/oculus_device.obj
c:\b\s\w\ir\cache\goma\client\gomacc.exe ..\..\third_party\llvm-build\Release+Asserts\bin\clang-cl.e...(too long)
../../device/vr/oculus/oculus_device.cc(65,17): error: no member named 'id' in 'device::mojom::VRDisplayInfo'
display_info->id = id;
~~~~~~~~~~~~~~^
1 error generated.

https://ci.chromium.org/p/chrome/builders/ci/win-chrome

Original change's description:
> Stop sending XRDeviceId with VRDisplayInfo
>
> This value is not used by Blink, and does not need to be communicated
> over the mojo interface. The XRDeviceId enum should not be removed
> because it is used for usage stats.
>
> Bug: 1017477
> Change-Id: I5e8cfff00c374f48495290c5dfb8911a1824a2de
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424684
> Reviewed-by: Alexander Cooper <alcooper@chromium.org>
> Reviewed-by: Chris Palmer <palmer@chromium.org>
> Auto-Submit: Brandon Jones <bajones@chromium.org>
> Commit-Queue: Brandon Jones <bajones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#810958}

TBR=palmer@chromium.org,bajones@chromium.org,bialpio@chromium.org,alcooper@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1017477
Change-Id: Ic5db77eb272086c7e51c900e8f23f722209dedb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434019
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#811183}

chrome/browser/android/vr/arcore_device/arcore_device.cc

@@ -33,8 +33,10 @@ namespace device {
 
 namespace {
 
-mojom::VRDisplayInfoPtr CreateVRDisplayInfo(const gfx::Size& frame_size) {
+mojom::VRDisplayInfoPtr CreateVRDisplayInfo(mojom::XRDeviceId device_id,
+                                            const gfx::Size& frame_size) {
   mojom::VRDisplayInfoPtr device = mojom::VRDisplayInfo::New();
+  device->id = device_id;
   device->webxr_default_framebuffer_scale = 1.0;
   device->left_eye = mojom::VREyeParameters::New();
   device->right_eye = nullptr;
@@ -78,7 +80,7 @@ ArCoreDevice::ArCoreDevice(
   // if initialization fails. Use an arbitrary but really low resolution to make
   // it obvious if we're using this data instead of the actual values we get
   // from the output drawing surface.
-  SetVRDisplayInfo(CreateVRDisplayInfo({16, 16}));
+  SetVRDisplayInfo(CreateVRDisplayInfo(GetId(), {16, 16}));
 }
 
 ArCoreDevice::ArCoreDevice()
@@ -175,7 +177,7 @@ void ArCoreDevice::OnDrawingSurfaceReady(gfx::AcceleratedWidget window,
            << frame_size.height() << " rotation=" << static_cast<int>(rotation);
   DCHECK(!session_state_->is_arcore_gl_initialized_);
 
-  auto display_info = CreateVRDisplayInfo(frame_size);
+  auto display_info = CreateVRDisplayInfo(GetId(), frame_size);
   SetVRDisplayInfo(std::move(display_info));
 
   RequestArCoreGlInitialization(window, rotation, frame_size);

content/browser/xr/service/browser_xr_runtime_impl.cc

@@ -111,12 +111,17 @@ device::mojom::VREyeParametersPtr ValidateEyeParameters(
 }
 
 device::mojom::VRDisplayInfoPtr ValidateVRDisplayInfo(
-    const device::mojom::VRDisplayInfo* info) {
+    const device::mojom::VRDisplayInfo* info,
+    device::mojom::XRDeviceId id) {
   if (!info)
     return nullptr;
 
   device::mojom::VRDisplayInfoPtr ret = device::mojom::VRDisplayInfo::New();
 
+  // Rather than just cloning everything, we copy over each field and validate
+  // individually.  This ensures new fields don't bypass validation.
+  ret->id = id;
+
   // Maximum 1000km translation.
   if (info->stage_parameters &&
       IsValidTransform(info->stage_parameters->mojo_from_floor, 1000000)) {
@@ -210,7 +215,7 @@ BrowserXRRuntimeImpl::BrowserXRRuntimeImpl(
     : id_(id),
       device_data_(std::move(device_data)),
       runtime_(std::move(runtime)),
-      display_info_(ValidateVRDisplayInfo(display_info.get())) {
+      display_info_(ValidateVRDisplayInfo(display_info.get(), id)) {
   DVLOG(2) << __func__ << ": id=" << id;
   // Unretained is safe because we are calling through an InterfacePtr we own,
   // so we won't be called after runtime_ is destroyed.
@@ -352,7 +357,7 @@ bool BrowserXRRuntimeImpl::SupportsNonEmulatedHeight() const {
 void BrowserXRRuntimeImpl::OnDisplayInfoChanged(
     device::mojom::VRDisplayInfoPtr vr_device_info) {
   bool had_display_info = !!display_info_;
-  display_info_ = ValidateVRDisplayInfo(vr_device_info.get());
+  display_info_ = ValidateVRDisplayInfo(vr_device_info.get(), id_);
   if (had_display_info) {
     for (VRServiceImpl* service : services_) {
       service->OnDisplayInfoChanged();

device/vr/android/gvr/gvr_device.cc

@@ -98,11 +98,14 @@ mojom::VREyeParametersPtr CreateEyeParamater(
   return eye_params;
 }
 
-mojom::VRDisplayInfoPtr CreateVRDisplayInfo(gvr::GvrApi* gvr_api) {
+mojom::VRDisplayInfoPtr CreateVRDisplayInfo(gvr::GvrApi* gvr_api,
+                                            mojom::XRDeviceId device_id) {
   TRACE_EVENT0("input", "GvrDelegate::CreateVRDisplayInfo");
 
   mojom::VRDisplayInfoPtr device = mojom::VRDisplayInfo::New();
 
+  device->id = device_id;
+
   gvr::BufferViewportList gvr_buffer_viewports =
       gvr_api->CreateEmptyBufferViewportList();
   gvr_buffer_viewports.SetToRecommendedBufferViewports();
@@ -267,7 +270,7 @@ GvrDelegateProvider* GvrDevice::GetGvrDelegateProvider() {
 void GvrDevice::OnDisplayConfigurationChanged(JNIEnv* env,
                                               const JavaRef<jobject>& obj) {
   DCHECK(gvr_api_);
-  SetVRDisplayInfo(CreateVRDisplayInfo(gvr_api_.get()));
+  SetVRDisplayInfo(CreateVRDisplayInfo(gvr_api_.get(), GetId()));
 }
 
 void GvrDevice::Init(base::OnceCallback<void(bool)> on_finished) {
@@ -291,7 +294,7 @@ void GvrDevice::CreateNonPresentingContext() {
   jlong context = Java_NonPresentingGvrContext_getNativeGvrContext(
       env, non_presenting_context_);
   gvr_api_ = gvr::GvrApi::WrapNonOwned(reinterpret_cast<gvr_context*>(context));
-  SetVRDisplayInfo(CreateVRDisplayInfo(gvr_api_.get()));
+  SetVRDisplayInfo(CreateVRDisplayInfo(gvr_api_.get(), GetId()));
 
   if (paused_) {
     PauseTracking();

device/vr/openxr/openxr_device.cc

@@ -27,9 +27,11 @@ constexpr unsigned int kRenderHeight = 1024;
 // However our mojo interface expects display info right away to support WebVR.
 // We create a fake display info to use, then notify the client that the display
 // info changed when we get real data.
-mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo() {
+mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo(device::mojom::XRDeviceId id) {
   mojom::VRDisplayInfoPtr display_info = mojom::VRDisplayInfo::New();
 
+  display_info->id = id;
+
   display_info->left_eye = mojom::VREyeParameters::New();
   display_info->right_eye = mojom::VREyeParameters::New();
 
@@ -59,7 +61,7 @@ OpenXrDevice::OpenXrDevice(OpenXrStatics* openxr_statics)
     : VRDeviceBase(device::mojom::XRDeviceId::OPENXR_DEVICE_ID),
       instance_(openxr_statics->GetXrInstance()),
       weak_ptr_factory_(this) {
-  mojom::VRDisplayInfoPtr display_info = CreateFakeVRDisplayInfo();
+  mojom::VRDisplayInfoPtr display_info = CreateFakeVRDisplayInfo(GetId());
   SetVRDisplayInfo(std::move(display_info));
 
 #if defined(OS_WIN)

device/vr/openxr/openxr_render_loop.cc

@@ -168,6 +168,8 @@ void OpenXrRenderLoop::InitializeDisplayInfo() {
     current_display_info_->left_eye = mojom::VREyeParameters::New();
   }
 
+  current_display_info_->id = device::mojom::XRDeviceId::OPENXR_DEVICE_ID;
+
   gfx::Size view_size = openxr_->GetViewSize();
   current_display_info_->left_eye->render_width = view_size.width();
   current_display_info_->right_eye->render_width = view_size.width();

device/vr/orientation/orientation_device.cc

@@ -27,6 +27,12 @@ using gfx::Vector3dF;
 namespace {
 static constexpr int kDefaultPumpFrequencyHz = 60;
 
+mojom::VRDisplayInfoPtr CreateVRDisplayInfo(mojom::XRDeviceId id) {
+  mojom::VRDisplayInfoPtr display_info = mojom::VRDisplayInfo::New();
+  display_info->id = id;
+  return display_info;
+}
+
 display::Display::Rotation GetRotation() {
   display::Screen* screen = display::Screen::GetScreen();
   if (!screen) {
@@ -48,7 +54,7 @@ VROrientationDevice::VROrientationDevice(mojom::SensorProvider* sensor_provider,
                              base::BindOnce(&VROrientationDevice::SensorReady,
                                             base::Unretained(this)));
 
-  SetVRDisplayInfo(mojom::VRDisplayInfo::New());
+  SetVRDisplayInfo(CreateVRDisplayInfo(GetId()));
 }
 
 VROrientationDevice::~VROrientationDevice() {

device/vr/public/mojom/vr_service.mojom

@@ -298,6 +298,7 @@ struct VRStageParameters {
 };
 
 struct VRDisplayInfo {
+  XRDeviceId id;
   VRStageParameters? stage_parameters;
   // Parameters required to distort a scene for viewing in a VR headset. Only
   // required for devices which have the can_present capability.

device/vr/test/fake_vr_device.cc

@@ -17,6 +17,8 @@ FakeVRDevice::~FakeVRDevice() {}
 
 mojom::VRDisplayInfoPtr FakeVRDevice::InitBasicDevice() {
   mojom::VRDisplayInfoPtr display_info = mojom::VRDisplayInfo::New();
+  display_info->id = GetId();
+
   display_info->left_eye = InitEye(45, -0.03f, 1024);
   display_info->right_eye = InitEye(45, 0.03f, 1024);
   return display_info;

device/vr/vr_device_base.cc

@@ -66,6 +66,7 @@ void VRDeviceBase::ListenToDeviceChanges(
 
 void VRDeviceBase::SetVRDisplayInfo(mojom::VRDisplayInfoPtr display_info) {
   DCHECK(display_info);
+  DCHECK(display_info->id == id_);
   display_info_ = std::move(display_info);
 
   if (listener_)

device/vr/vr_device_base_unittest.cc

@@ -72,10 +72,16 @@ class VRDeviceTest : public testing::Test {
   std::unique_ptr<VRDeviceBaseForTesting> MakeVRDevice() {
     std::unique_ptr<VRDeviceBaseForTesting> device =
         std::make_unique<VRDeviceBaseForTesting>();
-    device->SetVRDisplayInfoForTest(mojom::VRDisplayInfo::New());
+    device->SetVRDisplayInfoForTest(MakeVRDisplayInfo(device->GetId()));
     return device;
   }
 
+  mojom::VRDisplayInfoPtr MakeVRDisplayInfo(mojom::XRDeviceId device_id) {
+    mojom::VRDisplayInfoPtr display_info = mojom::VRDisplayInfo::New();
+    display_info->id = device_id;
+    return display_info;
+  }
+
   base::test::SingleThreadTaskEnvironment task_environment_;
 
   DISALLOW_COPY_AND_ASSIGN(VRDeviceTest);
@@ -93,7 +99,7 @@ TEST_F(VRDeviceTest, DeviceChangedDispatched) {
       base::DoNothing());  // TODO: consider getting initial info
   base::RunLoop().RunUntilIdle();
   EXPECT_CALL(listener, DoOnChanged(testing::_)).Times(1);
-  device->SetVRDisplayInfoForTest(mojom::VRDisplayInfo::New());
+  device->SetVRDisplayInfoForTest(MakeVRDisplayInfo(device->GetId()));
   base::RunLoop().RunUntilIdle();
 }
 

device/vr/windows_mixed_reality/mixed_reality_device.cc

@@ -27,8 +27,9 @@ namespace {
 // However our mojo interface expects display info right away to support WebVR.
 // We create a fake display info to use, then notify the client that the display
 // info changed when we get real data.
-mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo() {
+mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo(device::mojom::XRDeviceId id) {
   mojom::VRDisplayInfoPtr display_info = mojom::VRDisplayInfo::New();
+  display_info->id = id;
 
   display_info->left_eye = mojom::VREyeParameters::New();
   display_info->right_eye = mojom::VREyeParameters::New();
@@ -55,7 +56,7 @@ mojom::VRDisplayInfoPtr CreateFakeVRDisplayInfo() {
 
 MixedRealityDevice::MixedRealityDevice()
     : VRDeviceBase(device::mojom::XRDeviceId::WINDOWS_MIXED_REALITY_ID) {
-  SetVRDisplayInfo(CreateFakeVRDisplayInfo());
+  SetVRDisplayInfo(CreateFakeVRDisplayInfo(GetId()));
 }
 
 MixedRealityDevice::~MixedRealityDevice() {

device/vr/windows_mixed_reality/mixed_reality_renderloop.cc

@@ -671,6 +671,8 @@ bool MixedRealityRenderLoop::UpdateDisplayInfo() {
 
   if (!current_display_info_) {
     current_display_info_ = mojom::VRDisplayInfo::New();
+    current_display_info_->id =
+        device::mojom::XRDeviceId::WINDOWS_MIXED_REALITY_ID;
     changed = true;
   }