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

Unified Diff: content/browser/vr/vr_device_manager_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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
« no previous file with comments | « content/browser/vr/vr_device_manager.cc ('k') | content/browser/wake_lock/wake_lock_service_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/vr/vr_device_manager_unittest.cc
diff --git a/content/browser/vr/vr_device_manager_unittest.cc b/content/browser/vr/vr_device_manager_unittest.cc
index 86f35ae1d65f3acb976a069cba1bc0f4df21dc49..93c2ada4d075208ddfd47f2515895df122f9dc67 100644
--- a/content/browser/vr/vr_device_manager_unittest.cc
+++ b/content/browser/vr/vr_device_manager_unittest.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/browser/vr/vr_device_manager.h"
+
+#include <memory>
#include <utility>
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
#include "content/browser/vr/test/fake_vr_device.h"
#include "content/browser/vr/test/fake_vr_device_provider.h"
-#include "content/browser/vr/vr_device_manager.h"
#include "content/browser/vr/vr_device_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -26,7 +27,7 @@ class VRDeviceManagerTest : public testing::Test {
protected:
FakeVRDeviceProvider* provider_;
- scoped_ptr<VRDeviceManager> device_manager_;
+ std::unique_ptr<VRDeviceManager> device_manager_;
DISALLOW_COPY_AND_ASSIGN(VRDeviceManagerTest);
};
@@ -38,7 +39,7 @@ VRDeviceManagerTest::~VRDeviceManagerTest() {
}
void VRDeviceManagerTest::SetUp() {
- scoped_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
+ std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
provider_ = provider.get();
device_manager_.reset(new VRDeviceManager(std::move(provider)));
}
@@ -67,7 +68,7 @@ TEST_F(VRDeviceManagerTest, GetDevicesBasicTest) {
VRDevice* queried_device = device_manager_->GetDevice(1);
EXPECT_EQ(nullptr, queried_device);
- scoped_ptr<FakeVRDevice> device1(new FakeVRDevice(provider_));
+ std::unique_ptr<FakeVRDevice> device1(new FakeVRDevice(provider_));
provider_->AddDevice(device1.get());
webvr_devices = device_manager_->GetVRDevices();
// Should have successfully returned one device.
@@ -75,7 +76,7 @@ TEST_F(VRDeviceManagerTest, GetDevicesBasicTest) {
// The WebVRDevice index should match the device id.
EXPECT_EQ(webvr_devices[0]->index, device1->id());
- scoped_ptr<FakeVRDevice> device2(new FakeVRDevice(provider_));
+ std::unique_ptr<FakeVRDevice> device2(new FakeVRDevice(provider_));
provider_->AddDevice(device2.get());
webvr_devices = device_manager_->GetVRDevices();
// Should have successfully returned two devices.
« no previous file with comments | « content/browser/vr/vr_device_manager.cc ('k') | content/browser/wake_lock/wake_lock_service_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698