| Index: extensions/browser/api/bluetooth/bluetooth_private_apitest.cc
|
| diff --git a/extensions/browser/api/bluetooth/bluetooth_private_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_private_apitest.cc
|
| index 65adb8a379e27cb6bb80cb570c46f2f0d036124f..8307eb0b4f1795a6ac5dad6610cb8fb2a6b0be16 100644
|
| --- a/extensions/browser/api/bluetooth/bluetooth_private_apitest.cc
|
| +++ b/extensions/browser/api/bluetooth/bluetooth_private_apitest.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/command_line.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "device/bluetooth/test/mock_bluetooth_adapter.h"
|
| @@ -106,11 +106,11 @@ class BluetoothPrivateApiTest : public ExtensionApiTest {
|
| pairing_event.device.vendor_id_source = bt::VENDOR_ID_SOURCE_USB;
|
| pairing_event.device.type = bt::DEVICE_TYPE_PHONE;
|
|
|
| - scoped_ptr<base::ListValue> args =
|
| + std::unique_ptr<base::ListValue> args =
|
| bt_private::OnPairing::Create(pairing_event);
|
| - scoped_ptr<Event> event(new Event(events::BLUETOOTH_PRIVATE_ON_PAIRING,
|
| - bt_private::OnPairing::kEventName,
|
| - std::move(args)));
|
| + std::unique_ptr<Event> event(new Event(events::BLUETOOTH_PRIVATE_ON_PAIRING,
|
| + bt_private::OnPairing::kEventName,
|
| + std::move(args)));
|
| EventRouter::Get(browser()->profile())
|
| ->DispatchEventToExtension(kTestExtensionId, std::move(event));
|
| }
|
| @@ -133,7 +133,7 @@ class BluetoothPrivateApiTest : public ExtensionApiTest {
|
|
|
| void CallSetDiscoveryFilterCallback(
|
| device::BluetoothAdapter::DiscoverySessionCallback callback) {
|
| - auto session_ptr = scoped_ptr<NiceMock<MockBluetoothDiscoverySession>>(
|
| + auto session_ptr = std::unique_ptr<NiceMock<MockBluetoothDiscoverySession>>(
|
| mock_discovery_session_);
|
|
|
| callback.Run(std::move(session_ptr));
|
| @@ -145,7 +145,7 @@ class BluetoothPrivateApiTest : public ExtensionApiTest {
|
| bool adapter_discoverable_;
|
|
|
| scoped_refptr<NiceMock<MockBluetoothAdapter> > mock_adapter_;
|
| - scoped_ptr<NiceMock<MockBluetoothDevice> > mock_device_;
|
| + std::unique_ptr<NiceMock<MockBluetoothDevice>> mock_device_;
|
|
|
| // This discovery session will be owned by EventRouter, we'll only keep
|
| // pointer to it.
|
|
|