| Index: ui/gfx/win/physical_size.cc
|
| diff --git a/ui/gfx/win/physical_size.cc b/ui/gfx/win/physical_size.cc
|
| index 2aa0c3fd89256cc517238d933072619ffa2c0826..dcdee562e89775dcd2248f69d1e88f069184a5f2 100644
|
| --- a/ui/gfx/win/physical_size.cc
|
| +++ b/ui/gfx/win/physical_size.cc
|
| @@ -8,10 +8,10 @@
|
| #include <setupapi.h>
|
|
|
| #include <iostream>
|
| +#include <memory>
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/free_deleter.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/scoped_generic.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/win/registry.h"
|
| @@ -72,7 +72,7 @@ bool GetSizeFromRegistry(HDEVINFO device_info_list,
|
| bool GetInterfaceDetailAndDeviceInfo(
|
| HDEVINFO device_info_list,
|
| SP_DEVICE_INTERFACE_DATA* interface_data,
|
| - scoped_ptr<SP_DEVICE_INTERFACE_DETAIL_DATA, base::FreeDeleter>*
|
| + std::unique_ptr<SP_DEVICE_INTERFACE_DETAIL_DATA, base::FreeDeleter>*
|
| interface_detail,
|
| SP_DEVINFO_DATA* device_info) {
|
| DCHECK_EQ(sizeof(*device_info), device_info->cbSize);
|
| @@ -119,7 +119,7 @@ std::vector<PhysicalDisplaySize> GetPhysicalSizeForDisplays() {
|
| while (SetupDiEnumDeviceInterfaces(device_info_list.get(), nullptr,
|
| &GUID_DEVICEINTERFACE_MONITOR,
|
| interface_index++, &interface_data)) {
|
| - scoped_ptr<SP_DEVICE_INTERFACE_DETAIL_DATA, base::FreeDeleter>
|
| + std::unique_ptr<SP_DEVICE_INTERFACE_DETAIL_DATA, base::FreeDeleter>
|
| interface_detail;
|
| SP_DEVINFO_DATA device_info = {};
|
| device_info.cbSize = sizeof(device_info);
|
|
|