Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Unified Diff: device/vr/vr_service_impl_unittest.cc

Issue 2471433002: Implement WebVR presentation pausing for VR Shell Menu Mode (Closed)
Patch Set: Address comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/vr/vr_service_impl_unittest.cc
diff --git a/device/vr/vr_service_impl_unittest.cc b/device/vr/vr_service_impl_unittest.cc
index 300bf0dbfb960c8fc738333a2253a3fca33e7504..089b7c05000e480c4ab522019c0c81019007ccc1 100644
--- a/device/vr/vr_service_impl_unittest.cc
+++ b/device/vr/vr_service_impl_unittest.cc
@@ -4,6 +4,7 @@
#include "device/vr/vr_service_impl.h"
+#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "device/vr/test/fake_vr_device.h"
@@ -33,6 +34,8 @@ class MockVRServiceClient : public VRServiceClient {
last_display_ = std::move(display);
}
void OnDisplayDisconnected(unsigned index) override {}
+ void OnDisplayBlur(unsigned index) override {}
+ void OnDisplayFocus(unsigned index) override {}
const VRDisplayPtr& LastDisplay() { return last_display_; }
@@ -78,9 +81,9 @@ class VRServiceImplTest : public testing::Test {
protected:
void SetUp() override {
- std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
- provider_ = provider.get();
- device_manager_.reset(new VRDeviceManager(std::move(provider)));
+ FakeVRDeviceProvider* provider = new FakeVRDeviceProvider();
+ provider_ = provider;
+ device_manager_.reset(new VRDeviceManager(provider));
}
void TearDown() override { base::RunLoop().RunUntilIdle(); }
@@ -94,7 +97,7 @@ class VRServiceImplTest : public testing::Test {
bool presenting() { return !!device_manager_->presenting_service_; }
base::MessageLoop message_loop_;
- FakeVRDeviceProvider* provider_;
+ scoped_refptr<FakeVRDeviceProvider> provider_;
std::unique_ptr<VRDeviceManager> device_manager_;
DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest);
@@ -130,7 +133,7 @@ TEST_F(VRServiceImplTest, DeviceChangedDispatched) {
EXPECT_CALL(service_1->client(), OnDisplayChanged(_));
EXPECT_CALL(service_2->client(), OnDisplayChanged(_));
- std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
+ std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get()));
device_manager_->OnDeviceChanged(device->GetVRDevice());
base::RunLoop().RunUntilIdle();
@@ -144,7 +147,7 @@ TEST_F(VRServiceImplTest, DevicePresentationIsolation) {
std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
- std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
+ std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get()));
provider_->AddDevice(device.get());
// Ensure the device manager has seen the fake device
@@ -196,7 +199,7 @@ TEST_F(VRServiceImplTest, DeviceConnectedDispatched) {
EXPECT_CALL(service_1->client(), OnDisplayConnected(_));
EXPECT_CALL(service_2->client(), OnDisplayConnected(_));
- std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
+ std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get()));
device_manager_->OnDeviceConnectionStatusChanged(device.get(), true);
base::RunLoop().RunUntilIdle();

Powered by Google App Engine
This is Rietveld 408576698