Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: extensions/browser/api/bluetooth/bluetooth_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
Index: extensions/browser/api/bluetooth/bluetooth_apitest.cc
diff --git a/extensions/browser/api/bluetooth/bluetooth_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
index 184c4c8225cd69e07efab439b71b24b60cb77391..e586d4a063fb555c795f760226657eed8abcca0e 100644
--- a/extensions/browser/api/bluetooth/bluetooth_apitest.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
@@ -76,7 +76,7 @@ class BluetoothApiTest : public ExtensionApiTest {
const BluetoothAdapter::ErrorCallback& error_callback) {
if (mock_session_.get()) {
callback.Run(
- scoped_ptr<BluetoothDiscoverySession>(mock_session_.release()));
+ std::unique_ptr<BluetoothDiscoverySession>(mock_session_.release()));
return;
}
error_callback.Run();
@@ -91,10 +91,11 @@ class BluetoothApiTest : public ExtensionApiTest {
protected:
testing::StrictMock<MockBluetoothAdapter>* mock_adapter_;
- scoped_ptr<testing::NiceMock<MockBluetoothDiscoverySession> > mock_session_;
- scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device1_;
- scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device2_;
- scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device3_;
+ std::unique_ptr<testing::NiceMock<MockBluetoothDiscoverySession>>
+ mock_session_;
+ std::unique_ptr<testing::NiceMock<MockBluetoothDevice>> device1_;
+ std::unique_ptr<testing::NiceMock<MockBluetoothDevice>> device2_;
+ std::unique_ptr<testing::NiceMock<MockBluetoothDevice>> device3_;
extensions::BluetoothEventRouter* event_router() {
return bluetooth_api()->event_router();
@@ -130,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetAdapterState) {
scoped_refptr<api::BluetoothGetAdapterStateFunction> get_adapter_state;
get_adapter_state = setupFunction(new api::BluetoothGetAdapterStateFunction);
- scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
get_adapter_state.get(), "[]", browser()));
ASSERT_TRUE(result.get() != NULL);
api::bluetooth::AdapterState state;

Powered by Google App Engine
This is Rietveld 408576698