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

Side by Side Diff: chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc

Issue 2257103002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h" 5 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 372
373 CertificateInfo unused_info; 373 CertificateInfo unused_info;
374 return certificate_map_.LookUpCertificate(cert, has_extension, &unused_info, 374 return certificate_map_.LookUpCertificate(cert, has_extension, &unused_info,
375 extension_id); 375 extension_id);
376 } 376 }
377 377
378 std::unique_ptr<CertificateProvider> 378 std::unique_ptr<CertificateProvider>
379 CertificateProviderService::CreateCertificateProvider() { 379 CertificateProviderService::CreateCertificateProvider() {
380 DCHECK(thread_checker_.CalledOnValidThread()); 380 DCHECK(thread_checker_.CalledOnValidThread());
381 381
382 return base::WrapUnique(new CertificateProviderImpl( 382 return base::MakeUnique<CertificateProviderImpl>(
383 base::ThreadTaskRunnerHandle::Get(), weak_factory_.GetWeakPtr())); 383 base::ThreadTaskRunnerHandle::Get(), weak_factory_.GetWeakPtr());
384 } 384 }
385 385
386 void CertificateProviderService::OnExtensionUnloaded( 386 void CertificateProviderService::OnExtensionUnloaded(
387 const std::string& extension_id) { 387 const std::string& extension_id) {
388 DCHECK(thread_checker_.CalledOnValidThread()); 388 DCHECK(thread_checker_.CalledOnValidThread());
389 389
390 for (const int cert_request_id : 390 for (const int cert_request_id :
391 certificate_requests_.DropExtension(extension_id)) { 391 certificate_requests_.DropExtension(extension_id)) {
392 std::map<std::string, CertificateInfoList> certificates; 392 std::map<std::string, CertificateInfoList> certificates;
393 base::Callback<void(const net::CertificateList&)> callback; 393 base::Callback<void(const net::CertificateList&)> callback;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 const int sign_request_id = sign_requests_.AddRequest(extension_id, callback); 470 const int sign_request_id = sign_requests_.AddRequest(extension_id, callback);
471 if (!delegate_->DispatchSignRequestToExtension(extension_id, sign_request_id, 471 if (!delegate_->DispatchSignRequestToExtension(extension_id, sign_request_id,
472 hash, certificate, digest)) { 472 hash, certificate, digest)) {
473 sign_requests_.RemoveRequest(extension_id, sign_request_id, 473 sign_requests_.RemoveRequest(extension_id, sign_request_id,
474 nullptr /* callback */); 474 nullptr /* callback */);
475 callback.Run(net::ERR_FAILED, std::vector<uint8_t>()); 475 callback.Run(net::ERR_FAILED, std::vector<uint8_t>());
476 } 476 }
477 } 477 }
478 478
479 } // namespace chromeos 479 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698