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

Side by Side Diff: chrome/browser/certificate_manager_model.cc

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/certificate_manager_model.h" 5 #include "chrome/browser/certificate_manager_model.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 callback.Run(std::move(model)); 230 callback.Run(std::move(model));
231 } 231 }
232 232
233 // static 233 // static
234 void CertificateManagerModel::DidGetCertDBOnIOThread( 234 void CertificateManagerModel::DidGetCertDBOnIOThread(
235 CertificateManagerModel::Observer* observer, 235 CertificateManagerModel::Observer* observer,
236 const CreationCallback& callback, 236 const CreationCallback& callback,
237 net::NSSCertDatabase* cert_db) { 237 net::NSSCertDatabase* cert_db) {
238 DCHECK_CURRENTLY_ON(BrowserThread::IO); 238 DCHECK_CURRENTLY_ON(BrowserThread::IO);
239 239
240 bool is_user_db_available = cert_db->GetPublicSlot(); 240 bool is_user_db_available = !!cert_db->GetPublicSlot();
241 bool is_tpm_available = false; 241 bool is_tpm_available = false;
242 #if defined(OS_CHROMEOS) 242 #if defined(OS_CHROMEOS)
243 is_tpm_available = crypto::IsTPMTokenEnabledForNSS(); 243 is_tpm_available = crypto::IsTPMTokenEnabledForNSS();
244 #endif 244 #endif
245 BrowserThread::PostTask( 245 BrowserThread::PostTask(
246 BrowserThread::UI, 246 BrowserThread::UI,
247 FROM_HERE, 247 FROM_HERE,
248 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread, 248 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread,
249 cert_db, 249 cert_db,
250 is_user_db_available, 250 is_user_db_available,
251 is_tpm_available, 251 is_tpm_available,
252 observer, 252 observer,
253 callback)); 253 callback));
254 } 254 }
255 255
256 // static 256 // static
257 void CertificateManagerModel::GetCertDBOnIOThread( 257 void CertificateManagerModel::GetCertDBOnIOThread(
258 content::ResourceContext* context, 258 content::ResourceContext* context,
259 CertificateManagerModel::Observer* observer, 259 CertificateManagerModel::Observer* observer,
260 const CreationCallback& callback) { 260 const CreationCallback& callback) {
261 DCHECK_CURRENTLY_ON(BrowserThread::IO); 261 DCHECK_CURRENTLY_ON(BrowserThread::IO);
262 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext( 262 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
263 context, 263 context,
264 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, 264 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread,
265 observer, 265 observer,
266 callback)); 266 callback));
267 if (cert_db) 267 if (cert_db)
268 DidGetCertDBOnIOThread(observer, callback, cert_db); 268 DidGetCertDBOnIOThread(observer, callback, cert_db);
269 } 269 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698