| Index: chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| index 92e10f687f56f3445146afaf2711337b6c5a96d6..eacf06e698a0ac2c14edefc69b972081f4459507 100644
|
| --- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| +++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
|
| @@ -82,7 +82,7 @@ class DevicePermissionsManagerTest : public testing::Test {
|
|
|
| void TearDown() override { env_.reset(nullptr); }
|
|
|
| - scoped_ptr<extensions::TestExtensionEnvironment> env_;
|
| + std::unique_ptr<extensions::TestExtensionEnvironment> env_;
|
| const extensions::Extension* extension_;
|
| device::MockDeviceClient device_client_;
|
| scoped_refptr<MockUsbDevice> device0_;
|
| @@ -282,7 +282,7 @@ TEST_F(DevicePermissionsManagerTest, UpdateLastUsed) {
|
| }
|
|
|
| TEST_F(DevicePermissionsManagerTest, LoadPrefs) {
|
| - scoped_ptr<base::Value> prefs_value = base::test::ParseJson(
|
| + std::unique_ptr<base::Value> prefs_value = base::test::ParseJson(
|
| "["
|
| " {"
|
| " \"manufacturer_string\": \"Test Manufacturer\","
|
|
|