| Index: extensions/shell/browser/shell_device_client.h
|
| diff --git a/extensions/shell/browser/shell_device_client.h b/extensions/shell/browser/shell_device_client.h
|
| index 2a5e717c95a98093319ac161a04e17f8987c741a..7da2dbae72857da37a06d0afed0dd0a0905d70d8 100644
|
| --- a/extensions/shell/browser/shell_device_client.h
|
| +++ b/extensions/shell/browser/shell_device_client.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_
|
| #define EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_
|
|
|
| -#include "device/core/device_client.h"
|
| +#include <memory>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "device/core/device_client.h"
|
|
|
| namespace extensions {
|
|
|
| @@ -25,8 +25,8 @@ class ShellDeviceClient : device::DeviceClient {
|
| device::HidService* GetHidService() override;
|
|
|
| private:
|
| - scoped_ptr<device::HidService> hid_service_;
|
| - scoped_ptr<device::UsbService> usb_service_;
|
| + std::unique_ptr<device::HidService> hid_service_;
|
| + std::unique_ptr<device::UsbService> usb_service_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDeviceClient);
|
| };
|
|
|