| Index: device/usb/usb_context.h
|
| diff --git a/device/usb/usb_context.h b/device/usb/usb_context.h
|
| index 1d3e5123d9a9bf5531c331af380137fade48fd26..ee3abfcabfe2def644ad17e0f6f18f1b4c9d4bea 100644
|
| --- a/device/usb/usb_context.h
|
| +++ b/device/usb/usb_context.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef DEVICE_USB_USB_CONTEXT_H_
|
| #define DEVICE_USB_USB_CONTEXT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
|
|
| struct libusb_context;
|
| @@ -35,7 +36,7 @@ class UsbContext : public base::RefCountedThreadSafe<UsbContext> {
|
| class UsbEventHandler;
|
|
|
| PlatformUsbContext context_;
|
| - scoped_ptr<UsbEventHandler> event_handler_;
|
| + std::unique_ptr<UsbEventHandler> event_handler_;
|
| base::ThreadChecker thread_checker_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UsbContext);
|
|
|