Index: components/pairing/shark_connection_listener.h |
diff --git a/components/pairing/shark_connection_listener.h b/components/pairing/shark_connection_listener.h |
index c0b3836b526e267107ff95f73b36522e8ed23bf3..8cc225d3f9024272841779050ec633c51bb3838a 100644 |
--- a/components/pairing/shark_connection_listener.h |
+++ b/components/pairing/shark_connection_listener.h |
@@ -5,11 +5,11 @@ |
#ifndef COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_ |
#define COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_ |
+#include <memory> |
#include <string> |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "components/pairing/host_pairing_controller.h" |
namespace pairing_chromeos { |
@@ -19,8 +19,8 @@ namespace pairing_chromeos { |
// as an argument. |
class SharkConnectionListener : public HostPairingController::Observer { |
public: |
- typedef base::Callback<void(scoped_ptr<HostPairingController>)> |
- OnConnectedCallback; |
+ using OnConnectedCallback = |
+ base::Callback<void(std::unique_ptr<HostPairingController>)>; |
explicit SharkConnectionListener(OnConnectedCallback callback); |
~SharkConnectionListener() override; |
@@ -32,7 +32,7 @@ class SharkConnectionListener : public HostPairingController::Observer { |
void PairingStageChanged(Stage new_stage) override; |
OnConnectedCallback callback_; |
- scoped_ptr<HostPairingController> controller_; |
+ std::unique_ptr<HostPairingController> controller_; |
DISALLOW_COPY_AND_ASSIGN(SharkConnectionListener); |
}; |