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

Unified Diff: components/pairing/bluetooth_controller_pairing_controller.h

Issue 1921923002: Convert //components/[o-t]* 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: components/pairing/bluetooth_controller_pairing_controller.h
diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h
index 177211d7ca66e63348f858d96e8b11a306fcea63..15d0833702df2a9f1de627c7efdc50c984f32aa5 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.h
+++ b/components/pairing/bluetooth_controller_pairing_controller.h
@@ -7,10 +7,10 @@
#include <stdint.h>
+#include <memory>
#include <set>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
#include "components/pairing/controller_pairing_controller.h"
@@ -46,7 +46,7 @@ class BluetoothControllerPairingController
void OnSetPowered();
void OnGetAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
void OnStartDiscoverySession(
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
void OnConnect();
void OnConnectToService(scoped_refptr<device::BluetoothSocket> socket);
void OnSendComplete(int bytes_sent);
@@ -108,14 +108,14 @@ class BluetoothControllerPairingController
Stage current_stage_;
scoped_refptr<device::BluetoothAdapter> adapter_;
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
scoped_refptr<device::BluetoothSocket> socket_;
std::string controller_device_id_;
std::string confirmation_code_;
std::set<std::string> discovered_devices_;
- scoped_ptr<ProtoDecoder> proto_decoder_;
+ std::unique_ptr<ProtoDecoder> proto_decoder_;
base::ThreadChecker thread_checker_;
base::ObserverList<ControllerPairingController::Observer> observers_;

Powered by Google App Engine
This is Rietveld 408576698