| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/net/nss_context.h" | 5 #include "chrome/browser/net/nss_context.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile_io_data.h" | 7 #include "chrome/browser/profiles/profile_io_data.h" |
| 8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "crypto/nss_util_internal.h" | 9 #include "crypto/nss_util_internal.h" |
| 10 #include "net/cert/nss_cert_database_chromeos.h" |
| 10 | 11 |
| 11 namespace { | 12 namespace { |
| 12 std::string GetUsername(content::ResourceContext* context) { | 13 std::string GetUsername(content::ResourceContext* context) { |
| 13 return ProfileIOData::FromResourceContext(context)->username_hash(); | 14 return ProfileIOData::FromResourceContext(context)->username_hash(); |
| 14 } | 15 } |
| 15 } // namespace | 16 } // namespace |
| 16 | 17 |
| 17 crypto::ScopedPK11Slot GetPublicNSSKeySlotForResourceContext( | 18 crypto::ScopedPK11Slot GetPublicNSSKeySlotForResourceContext( |
| 18 content::ResourceContext* context) { | 19 content::ResourceContext* context) { |
| 19 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 20 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
| 20 return crypto::GetPublicSlotForChromeOSUser(GetUsername(context)); | 21 return crypto::GetPublicSlotForChromeOSUser(GetUsername(context)); |
| 21 } | 22 } |
| 22 | 23 |
| 23 crypto::ScopedPK11Slot GetPrivateNSSKeySlotForResourceContext( | 24 crypto::ScopedPK11Slot GetPrivateNSSKeySlotForResourceContext( |
| 24 content::ResourceContext* context, | 25 content::ResourceContext* context, |
| 25 const base::Callback<void(crypto::ScopedPK11Slot)>& callback) { | 26 const base::Callback<void(crypto::ScopedPK11Slot)>& callback) { |
| 26 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 27 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
| 27 return crypto::GetPrivateSlotForChromeOSUser(GetUsername(context), callback); | 28 return crypto::GetPrivateSlotForChromeOSUser(GetUsername(context), callback); |
| 28 } | 29 } |
| 29 | 30 |
| 31 net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext( |
| 32 content::ResourceContext* context, |
| 33 const base::Callback<void(net::NSSCertDatabase*)>& callback) { |
| 34 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
| 35 return net::NSSCertDatabaseChromeOS::GetForUser(GetUsername(context), |
| 36 callback); |
| 37 } |
| OLD | NEW |