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

Unified Diff: components/password_manager/core/browser/affiliated_match_helper.h

Issue 1852093002: components/password_manager: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and revert an accidental .proto change Created 4 years, 9 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/password_manager/core/browser/affiliated_match_helper.h
diff --git a/components/password_manager/core/browser/affiliated_match_helper.h b/components/password_manager/core/browser/affiliated_match_helper.h
index bde81a841feb85cfaeb51a25fc534718c2c3268e..a72268f86369cd525e881d88865b5b3d056b781f 100644
--- a/components/password_manager/core/browser/affiliated_match_helper.h
+++ b/components/password_manager/core/browser/affiliated_match_helper.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "components/password_manager/core/browser/affiliation_utils.h"
#include "components/password_manager/core/browser/password_store.h"
@@ -59,8 +59,9 @@ class AffiliatedMatchHelper : public PasswordStore::Observer,
// The |password_store| must outlive |this|. Both arguments must be non-NULL,
// except in tests which do not Initialize() the object.
- AffiliatedMatchHelper(PasswordStore* password_store,
- scoped_ptr<AffiliationService> affiliation_service);
+ AffiliatedMatchHelper(
+ PasswordStore* password_store,
+ std::unique_ptr<AffiliationService> affiliation_service);
~AffiliatedMatchHelper() override;
// Schedules deferred initialization.
@@ -156,7 +157,7 @@ class AffiliatedMatchHelper : public PasswordStore::Observer,
scoped_refptr<base::SingleThreadTaskRunner> task_runner_for_waiting_;
// Being the sole consumer of AffiliationService, |this| owns the service.
- scoped_ptr<AffiliationService> affiliation_service_;
+ std::unique_ptr<AffiliationService> affiliation_service_;
base::WeakPtrFactory<AffiliatedMatchHelper> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698