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

Unified Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h
index 42269c4164eab67f94a4c101f5b9114dbb53a602..f72f2a7fea86509f0a627747eba80ccbe618d0ff 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_CONNECTION_H_
#define CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_CONNECTION_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "extensions/browser/api/api_resource.h"
#include "extensions/browser/api/api_resource_manager.h"
@@ -21,7 +22,7 @@ class EasyUnlockPrivateConnection : public ApiResource {
EasyUnlockPrivateConnection(
bool persistent,
const std::string& owner_extension_id,
- scoped_ptr<proximity_auth::Connection> connection);
+ std::unique_ptr<proximity_auth::Connection> connection);
~EasyUnlockPrivateConnection() override;
// Returns a pointer to the underlying connection object.
@@ -45,7 +46,7 @@ class EasyUnlockPrivateConnection : public ApiResource {
// The connection is owned by this instance and will automatically disconnect
// when deleted.
- scoped_ptr<proximity_auth::Connection> connection_;
+ std::unique_ptr<proximity_auth::Connection> connection_;
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateConnection);
};

Powered by Google App Engine
This is Rietveld 408576698