Index: crypto/nss_util.cc |
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc |
index f26bf0979a6ad2181d216fb2049a3255315fc419..358656790078fa6d1f60dc41146037569b9ae2d9 100644 |
--- a/crypto/nss_util.cc |
+++ b/crypto/nss_util.cc |
@@ -264,13 +264,13 @@ class ChromeOSUserData { |
}; |
class ScopedChapsLoadFixup { |
- public: |
- ScopedChapsLoadFixup(); |
- ~ScopedChapsLoadFixup(); |
+ public: |
+ ScopedChapsLoadFixup(); |
+ ~ScopedChapsLoadFixup(); |
- private: |
+ private: |
#if defined(COMPONENT_BUILD) |
- void *chaps_handle_; |
+ void* chaps_handle_; |
#endif |
}; |
@@ -368,14 +368,11 @@ class NSSInitSingleton { |
if (base::WorkerPool::PostTaskAndReply( |
FROM_HERE, |
base::Bind(&NSSInitSingleton::InitializeTPMTokenOnWorkerThread, |
- system_slot_id, |
- tpm_args_ptr), |
+ system_slot_id, tpm_args_ptr), |
base::Bind(&NSSInitSingleton::OnInitializedTPMTokenAndSystemSlot, |
base::Unretained(this), // NSSInitSingleton is leaky |
- callback, |
- base::Passed(&tpm_args)), |
- true /* task_is_slow */ |
- )) { |
+ callback, base::Passed(&tpm_args)), |
+ true /* task_is_slow */)) { |
initializing_tpm_token_ = true; |
} else { |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
@@ -530,15 +527,12 @@ class NSSInitSingleton { |
TPMModuleAndSlot* tpm_args_ptr = tpm_args.get(); |
base::WorkerPool::PostTaskAndReply( |
FROM_HERE, |
- base::Bind(&NSSInitSingleton::InitializeTPMTokenOnWorkerThread, |
- slot_id, |
+ base::Bind(&NSSInitSingleton::InitializeTPMTokenOnWorkerThread, slot_id, |
tpm_args_ptr), |
base::Bind(&NSSInitSingleton::OnInitializedTPMForChromeOSUser, |
base::Unretained(this), // NSSInitSingleton is leaky |
- username_hash, |
- base::Passed(&tpm_args)), |
- true /* task_is_slow */ |
- ); |
+ username_hash, base::Passed(&tpm_args)), |
+ true /* task_is_slow */); |
} |
void OnInitializedTPMForChromeOSUser( |