extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc - Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc ('k') | extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

index 74c0842485ab5424674e8c39347e2d543634c5bb..1462ed49274f9ab7b4ebf2c690db81dbeff9fba6 100644

--- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

+++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

@@ -2,10 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include <memory>

#include <string>

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

#include "device/bluetooth/bluetooth_adapter_factory.h"

#include "device/bluetooth/bluetooth_uuid.h"

@@ -67,8 +67,8 @@ class BluetoothSocketApiTest : public extensions::ShellApiTest {

protected:

scoped_refptr<testing::StrictMock<MockBluetoothAdapter> > mock_adapter_;

- scoped_ptr<testing::NiceMock<MockBluetoothDevice> > mock_device1_;

- scoped_ptr<testing::NiceMock<MockBluetoothDevice> > mock_device2_;

+ std::unique_ptr<testing::NiceMock<MockBluetoothDevice>> mock_device1_;

+ std::unique_ptr<testing::NiceMock<MockBluetoothDevice>> mock_device2_;

private:

scoped_refptr<Extension> empty_extension_;