Fixes 2D-to-WebVR site transitions when browsing in VR.

device/vr/test/fake_vr_device.cc

Index: device/vr/test/fake_vr_device.cc
diff --git a/device/vr/test/fake_vr_device.cc b/device/vr/test/fake_vr_device.cc
index c699905019dff22bee1b1b63e2c6d2f13e57e77e..a94dcbdcb3eebbeb0100822c07ee3c94cf4f1b08 100644
--- a/device/vr/test/fake_vr_device.cc
+++ b/device/vr/test/fake_vr_device.cc
@@ -7,7 +7,7 @@
 namespace device {
 
 FakeVRDevice::FakeVRDevice() {
-  device_ = mojom::VRDisplayInfo::New();
+  display_info_ = mojom::VRDisplayInfo::New();
 
   InitBasicDevice();
 }
@@ -15,17 +15,17 @@ FakeVRDevice::FakeVRDevice() {
 FakeVRDevice::~FakeVRDevice() {}
 
 void FakeVRDevice::InitBasicDevice() {
-  device_->index = id();
-  device_->displayName = "FakeVRDevice";
+  display_info_->index = id();
+  display_info_->displayName = "FakeVRDevice";
 
-  device_->capabilities = mojom::VRDisplayCapabilities::New();
-  device_->capabilities->hasOrientation = true;
-  device_->capabilities->hasPosition = false;
-  device_->capabilities->hasExternalDisplay = false;
-  device_->capabilities->canPresent = false;
+  display_info_->capabilities = mojom::VRDisplayCapabilities::New();
+  display_info_->capabilities->hasOrientation = true;
+  display_info_->capabilities->hasPosition = false;
+  display_info_->capabilities->hasExternalDisplay = false;
+  display_info_->capabilities->canPresent = false;
 
-  device_->leftEye = InitEye(45, -0.03f, 1024);
-  device_->rightEye = InitEye(45, 0.03f, 1024);
+  display_info_->leftEye = InitEye(45, -0.03f, 1024);
+  display_info_->rightEye = InitEye(45, 0.03f, 1024);
 }
 
 mojom::VREyeParametersPtr FakeVRDevice::InitEye(float fov,
@@ -51,13 +51,13 @@ mojom::VREyeParametersPtr FakeVRDevice::InitEye(float fov,
 }
 
 void FakeVRDevice::SetVRDevice(const mojom::VRDisplayInfoPtr& device) {

[amp, 2017/03/13 22:26:05]

Any reason not to rename the param here to display_info to be consistent?

[tiborg, 2017/03/13 23:00:58]

Good call! Changed it.

-  device_ = device.Clone();
+  display_info_ = device.Clone();
 }
 
-void FakeVRDevice::GetVRDevice(
-    const base::Callback<void(mojom::VRDisplayInfoPtr)>& callback) {
-  mojom::VRDisplayInfoPtr display = device_.Clone();
-  callback.Run(std::move(display));
+void FakeVRDevice::CreateVRDisplayInfo(
+    const base::Callback<void(mojom::VRDisplayInfoPtr)>& onCreated) {
+  mojom::VRDisplayInfoPtr display = display_info_.Clone();
+  onCreated.Run(std::move(display));
 }
 
 void FakeVRDevice::ResetPose() {}