| Index: extensions/browser/api/usb/usb_apitest.cc
|
| diff --git a/extensions/browser/api/usb/usb_apitest.cc b/extensions/browser/api/usb/usb_apitest.cc
|
| index 887ae2170fb1bf9429499f04ce2b6db4d7292784..3be38496c29b1af5c33e20e61d399abf5b3668b6 100644
|
| --- a/extensions/browser/api/usb/usb_apitest.cc
|
| +++ b/extensions/browser/api/usb/usb_apitest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <numeric>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/test/test_utils.h"
|
| @@ -112,9 +113,9 @@ class TestExtensionsAPIClient : public ShellExtensionsAPIClient {
|
| public:
|
| TestExtensionsAPIClient() : ShellExtensionsAPIClient() {}
|
|
|
| - scoped_ptr<DevicePermissionsPrompt> CreateDevicePermissionsPrompt(
|
| + std::unique_ptr<DevicePermissionsPrompt> CreateDevicePermissionsPrompt(
|
| content::WebContents* web_contents) const override {
|
| - return make_scoped_ptr(new TestDevicePermissionsPrompt(web_contents));
|
| + return base::WrapUnique(new TestDevicePermissionsPrompt(web_contents));
|
| }
|
| };
|
|
|
| @@ -141,7 +142,7 @@ class UsbApiTest : public ShellApiTest {
|
| protected:
|
| scoped_refptr<MockUsbDeviceHandle> mock_device_handle_;
|
| scoped_refptr<MockUsbDevice> mock_device_;
|
| - scoped_ptr<MockDeviceClient> device_client_;
|
| + std::unique_ptr<MockDeviceClient> device_client_;
|
| };
|
|
|
| } // namespace
|
|
|