Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

chrome/browser/chromeos/platform_keys/platform_keys_service.cc

Index: chrome/browser/chromeos/platform_keys/platform_keys_service.cc
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
index a41cd8d7c2506b2e3b17fa1d3d57f3f58b18317a..520b25a7e99ceb213bec186c4327b03887c44962 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
@@ -12,6 +12,7 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/platform_keys/platform_keys.h"
@@ -134,7 +135,7 @@ class PlatformKeysService::GenerateRSAKeyTask : public Task {
                                   base::Unretained(this)));
   }
 
-  void GotPermissions(scoped_ptr<KeyPermissions::PermissionsForExtension>
+  void GotPermissions(std::unique_ptr<KeyPermissions::PermissionsForExtension>
                           extension_permissions) {
     extension_permissions_ = std::move(extension_permissions);
     DoStep();
@@ -147,7 +148,8 @@ class PlatformKeysService::GenerateRSAKeyTask : public Task {
   std::string public_key_spki_der_;
   const std::string extension_id_;
   GenerateKeyCallback callback_;
-  scoped_ptr<KeyPermissions::PermissionsForExtension> extension_permissions_;
+  std::unique_ptr<KeyPermissions::PermissionsForExtension>
+      extension_permissions_;
   KeyPermissions* const key_permissions_;
   PlatformKeysService* const service_;
   content::BrowserContext* const browser_context_;
@@ -233,7 +235,7 @@ class PlatformKeysService::SignTask : public Task {
         base::Bind(&SignTask::GotPermissions, base::Unretained(this)));
   }
 
-  void GotPermissions(scoped_ptr<KeyPermissions::PermissionsForExtension>
+  void GotPermissions(std::unique_ptr<KeyPermissions::PermissionsForExtension>
                           extension_permissions) {
     extension_permissions_ = std::move(extension_permissions);
     DoStep();
@@ -275,7 +277,8 @@ class PlatformKeysService::SignTask : public Task {
   const platform_keys::HashAlgorithm hash_algorithm_;
   const std::string extension_id_;
   const SignCallback callback_;
-  scoped_ptr<KeyPermissions::PermissionsForExtension> extension_permissions_;
+  std::unique_ptr<KeyPermissions::PermissionsForExtension>
+      extension_permissions_;
   KeyPermissions* const key_permissions_;
   PlatformKeysService* const service_;
   base::WeakPtrFactory<SignTask> weak_factory_;
@@ -303,7 +306,7 @@ class PlatformKeysService::SelectTask : public Task {
   // |interactive| is false, matching certs that the extension has permission
   // for are passed to |callback|.
   SelectTask(const platform_keys::ClientCertificateRequest& request,
-             scoped_ptr<net::CertificateList> input_client_certificates,
+             std::unique_ptr<net::CertificateList> input_client_certificates,
              bool interactive,
              const std::string& extension_id,
              const SelectCertificatesCallback& callback,
@@ -371,7 +374,7 @@ class PlatformKeysService::SelectTask : public Task {
         base::Bind(&SelectTask::GotPermissions, base::Unretained(this)));
   }
 
-  void GotPermissions(scoped_ptr<KeyPermissions::PermissionsForExtension>
+  void GotPermissions(std::unique_ptr<KeyPermissions::PermissionsForExtension>
                           extension_permissions) {
     extension_permissions_ = std::move(extension_permissions);
     DoStep();
@@ -392,7 +395,7 @@ class PlatformKeysService::SelectTask : public Task {
   // |error_message| contain an error message.
   // Note that the order of |matches|, based on the expiration/issuance date, is
   // relevant and must be preserved in any processing of the list.
-  void GotMatchingCerts(scoped_ptr<net::CertificateList> matches,
+  void GotMatchingCerts(std::unique_ptr<net::CertificateList> matches,
                         const std::string& error_message) {
     if (!error_message.empty()) {
       next_step_ = Step::DONE;
@@ -445,7 +448,7 @@ class PlatformKeysService::SelectTask : public Task {
         base::Bind(&SelectTask::GotIntersection, weak_factory_.GetWeakPtr()));
   }
 
-  void GotIntersection(scoped_ptr<net::CertificateList> intersection) {
+  void GotIntersection(std::unique_ptr<net::CertificateList> intersection) {
     matches_.swap(*intersection);
     DoStep();
   }
@@ -491,7 +494,7 @@ class PlatformKeysService::SelectTask : public Task {
   // interactive), the certificates that the extension has unlimited sign
   // permission for. Passes the filtered certs to |callback_|.
   void FilterSelectionByPermission() {
-    scoped_ptr<net::CertificateList> selection(new net::CertificateList);
+    std::unique_ptr<net::CertificateList> selection(new net::CertificateList);
     if (interactive_) {
       if (selected_cert_)
         selection->push_back(selected_cert_);
@@ -499,7 +502,8 @@ class PlatformKeysService::SelectTask : public Task {
       selection->assign(matches_.begin(), matches_.end());
     }
 
-    scoped_ptr<net::CertificateList> filtered_certs(new net::CertificateList);
+    std::unique_ptr<net::CertificateList> filtered_certs(
+        new net::CertificateList);
     for (scoped_refptr<net::X509Certificate> selected_cert : *selection) {
       const std::string public_key_spki_der(
           platform_keys::GetSubjectPublicKeyInfo(selected_cert));
@@ -523,12 +527,13 @@ class PlatformKeysService::SelectTask : public Task {
   net::CertificateList matches_;
   scoped_refptr<net::X509Certificate> selected_cert_;
   platform_keys::ClientCertificateRequest request_;
-  scoped_ptr<net::CertificateList> input_client_certificates_;
+  std::unique_ptr<net::CertificateList> input_client_certificates_;
   const bool interactive_;
   const std::string extension_id_;
   const SelectCertificatesCallback callback_;
   content::WebContents* const web_contents_;
-  scoped_ptr<KeyPermissions::PermissionsForExtension> extension_permissions_;
+  std::unique_ptr<KeyPermissions::PermissionsForExtension>
+      extension_permissions_;
   KeyPermissions* const key_permissions_;
   PlatformKeysService* const service_;
   base::WeakPtrFactory<SelectTask> weak_factory_;
@@ -562,7 +567,7 @@ PlatformKeysService::~PlatformKeysService() {
 }
 
 void PlatformKeysService::SetSelectDelegate(
-    scoped_ptr<SelectDelegate> delegate) {
+    std::unique_ptr<SelectDelegate> delegate) {
   select_delegate_ = std::move(delegate);
 }
 
@@ -571,7 +576,7 @@ void PlatformKeysService::GenerateRSAKey(const std::string& token_id,
                                          const std::string& extension_id,
                                          const GenerateKeyCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  StartOrQueueTask(make_scoped_ptr(
+  StartOrQueueTask(base::WrapUnique(
       new GenerateRSAKeyTask(token_id, modulus_length, extension_id, callback,
                              &key_permissions_, this, browser_context_)));
 }
@@ -584,7 +589,7 @@ void PlatformKeysService::SignRSAPKCS1Digest(
     const std::string& extension_id,
     const SignCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  StartOrQueueTask(make_scoped_ptr(new SignTask(
+  StartOrQueueTask(base::WrapUnique(new SignTask(
       token_id, data, public_key, false /* digest before signing */,
       hash_algorithm, extension_id, callback, &key_permissions_, this)));
 }
@@ -595,7 +600,7 @@ void PlatformKeysService::SignRSAPKCS1Raw(const std::string& token_id,
                                           const std::string& extension_id,
                                           const SignCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  StartOrQueueTask(make_scoped_ptr(new SignTask(
+  StartOrQueueTask(base::WrapUnique(new SignTask(
       token_id, data, public_key, true /* sign directly without hashing */,
       platform_keys::HASH_ALGORITHM_NONE, extension_id, callback,
       &key_permissions_, this)));
@@ -603,18 +608,18 @@ void PlatformKeysService::SignRSAPKCS1Raw(const std::string& token_id,
 
 void PlatformKeysService::SelectClientCertificates(
     const platform_keys::ClientCertificateRequest& request,
-    scoped_ptr<net::CertificateList> client_certificates,
+    std::unique_ptr<net::CertificateList> client_certificates,
     bool interactive,
     const std::string& extension_id,
     const SelectCertificatesCallback& callback,
     content::WebContents* web_contents) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  StartOrQueueTask(make_scoped_ptr(new SelectTask(
+  StartOrQueueTask(base::WrapUnique(new SelectTask(
       request, std::move(client_certificates), interactive, extension_id,
       callback, web_contents, &key_permissions_, this)));
 }
 
-void PlatformKeysService::StartOrQueueTask(scoped_ptr<Task> task) {
+void PlatformKeysService::StartOrQueueTask(std::unique_ptr<Task> task) {
   tasks_.push(make_linked_ptr(task.release()));
   if (tasks_.size() == 1)
     tasks_.front()->Start();