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

Unified Diff: components/proximity_auth/throttled_bluetooth_connection_finder.h

Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits 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/proximity_auth/throttled_bluetooth_connection_finder.h
diff --git a/components/proximity_auth/throttled_bluetooth_connection_finder.h b/components/proximity_auth/throttled_bluetooth_connection_finder.h
index c107bb33b544380db9a447ed3bd2f8b83d5e07b4..89c92e30f01e05aa56b5ff443ebd8484683b83f6 100644
--- a/components/proximity_auth/throttled_bluetooth_connection_finder.h
+++ b/components/proximity_auth/throttled_bluetooth_connection_finder.h
@@ -5,9 +5,10 @@
#ifndef COMPONENTS_PROXIMITY_AUTH_THROTTLED_BLUETOOTH_CONNECTION_FINDER_H
#define COMPONENTS_PROXIMITY_AUTH_THROTTLED_BLUETOOTH_CONNECTION_FINDER_H
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/proximity_auth/connection_finder.h"
@@ -27,7 +28,7 @@ class ThrottledBluetoothConnectionFinder : public ConnectionFinder {
public:
// Note: The |throttler| is not owned, and must outlive |this| instance.
ThrottledBluetoothConnectionFinder(
- scoped_ptr<BluetoothConnectionFinder> connection_finder,
+ std::unique_ptr<BluetoothConnectionFinder> connection_finder,
scoped_refptr<base::TaskRunner> task_runner,
BluetoothThrottler* throttler);
~ThrottledBluetoothConnectionFinder() override;
@@ -38,10 +39,10 @@ class ThrottledBluetoothConnectionFinder : public ConnectionFinder {
private:
// Callback to be called when a connection is found.
void OnConnection(const ConnectionCallback& connection_callback,
- scoped_ptr<Connection> connection);
+ std::unique_ptr<Connection> connection);
// The underlying connection finder.
- scoped_ptr<BluetoothConnectionFinder> connection_finder_;
+ std::unique_ptr<BluetoothConnectionFinder> connection_finder_;
// The task runner used for posting delayed messages.
scoped_refptr<base::TaskRunner> task_runner_;
« no previous file with comments | « components/proximity_auth/screenlock_bridge.cc ('k') | components/proximity_auth/throttled_bluetooth_connection_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698