OLD | NEW |
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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 } | 297 } |
298 | 298 |
299 void StartNSSInitOnIOThread(const std::string& username, | 299 void StartNSSInitOnIOThread(const std::string& username, |
300 const std::string& username_hash, | 300 const std::string& username_hash, |
301 const base::FilePath& path) { | 301 const base::FilePath& path) { |
302 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 302 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
303 DVLOG(1) << "Starting NSS init for " << username | 303 DVLOG(1) << "Starting NSS init for " << username |
304 << " hash:" << username_hash; | 304 << " hash:" << username_hash; |
305 | 305 |
306 // Make sure NSS is initialized for the user. | 306 // Make sure NSS is initialized for the user. |
307 crypto::InitializeNSSForChromeOSUser(username, username_hash, path); | 307 crypto::InitializeNSSForChromeOSUser(username_hash, path); |
308 | 308 |
309 // Check if it's OK to initialize TPM for the user before continuing. This | 309 // Check if it's OK to initialize TPM for the user before continuing. This |
310 // may not be the case if the TPM slot initialization was previously | 310 // may not be the case if the TPM slot initialization was previously |
311 // requested for the same user. | 311 // requested for the same user. |
312 if (!crypto::ShouldInitializeTPMForChromeOSUser(username_hash)) | 312 if (!crypto::ShouldInitializeTPMForChromeOSUser(username_hash)) |
313 return; | 313 return; |
314 | 314 |
315 crypto::WillInitializeTPMForChromeOSUser(username_hash); | 315 crypto::WillInitializeTPMForChromeOSUser(username_hash); |
316 | 316 |
317 if (crypto::IsTPMTokenEnabledForNSS()) { | 317 if (crypto::IsTPMTokenEnabledForNSS()) { |
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 void ProfileIOData::SetCookieSettingsForTesting( | 1276 void ProfileIOData::SetCookieSettingsForTesting( |
1277 CookieSettings* cookie_settings) { | 1277 CookieSettings* cookie_settings) { |
1278 DCHECK(!cookie_settings_.get()); | 1278 DCHECK(!cookie_settings_.get()); |
1279 cookie_settings_ = cookie_settings; | 1279 cookie_settings_ = cookie_settings; |
1280 } | 1280 } |
1281 | 1281 |
1282 void ProfileIOData::set_signin_names_for_testing( | 1282 void ProfileIOData::set_signin_names_for_testing( |
1283 SigninNamesOnIOThread* signin_names) { | 1283 SigninNamesOnIOThread* signin_names) { |
1284 signin_names_.reset(signin_names); | 1284 signin_names_.reset(signin_names); |
1285 } | 1285 } |
OLD | NEW |