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

device/vr/vr_display_impl_unittest.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 "device/vr/vr_display_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "device/vr/test/fake_vr_device.h"
@@ skipping 42 matching lines @@
   }
 
   void ExitPresent(VRDisplayImpl* display_impl) { display_impl->ExitPresent(); }
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
   VRDevice* device() { return device_; }
 
   bool presenting() { return !!device_->presenting_display_; }
 
+  VRDisplayImpl* GetVRDisplayImpl(VRServiceImpl* service, VRDevice* device) {

[mthiesse, 2017/03/13 22:17:29]

Why add this function?

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

In C++ friend declarations are not inheritable. TEST_F makes a subclass of
VRDisplayImplTest and overrides the TestBody() function with the test content.
In the overriding TestBody() I cannot call private functions of VRDisplayImpl
anymore. This function works around this limitation.

+    return service->GetVRDisplayImpl(device);
+  }
+
   base::MessageLoop message_loop_;
   bool is_request_presenting_success_ = false;
   FakeVRDeviceProvider* provider_;
   FakeVRDevice* device_;
   std::vector<FakeVRServiceClient*> clients_;
   std::unique_ptr<VRDeviceManager> device_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(VRDisplayImplTest);
 };
 
 TEST_F(VRDisplayImplTest, DevicePresentationIsolation) {
   auto service_1 = BindService();
   auto service_2 = BindService();
 
-  VRDisplayImpl* display_1 = service_1->GetVRDisplayImpl(device());
-  VRDisplayImpl* display_2 = service_2->GetVRDisplayImpl(device());
+  VRDisplayImpl* display_1 = GetVRDisplayImpl(service_1.get(), device());
+  VRDisplayImpl* display_2 = GetVRDisplayImpl(service_2.get(), device());
 
   // When not presenting either service should be able to access the device.
   EXPECT_TRUE(device()->IsAccessAllowed(display_1));
   EXPECT_TRUE(device()->IsAccessAllowed(display_2));
 
   // Begin presenting to the fake device with service 1.
   RequestPresent(display_1);
   EXPECT_TRUE(is_request_presenting_success_);
   EXPECT_TRUE(presenting());
 
@@ skipping 27 matching lines @@
   auto service_2 = BindService();
 
   device()->OnChanged();
 
   base::RunLoop().RunUntilIdle();
 
   for (auto* client : clients_)
     EXPECT_TRUE(client->CheckDeviceId(device()->id()));
 }
 }