Replace c/b/nss_context by a KeyedService.

chromeos/tpm_token_loader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/tpm_token_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 32 matching lines @@
                             bool success) {
   runner->PostTask(FROM_HERE, base::Bind(callback, success));
 }
 
 }  // namespace
 
 static TPMTokenLoader* g_tpm_token_loader = NULL;
 
 // static
 void TPMTokenLoader::Initialize() {
+  if (g_tpm_token_loader && g_tpm_token_loader->initialized_for_test_)
+    return;
   CHECK(!g_tpm_token_loader);
   g_tpm_token_loader = new TPMTokenLoader(false /*for_test*/);
 }
 
 // static
 void TPMTokenLoader::InitializeForTest() {
   CHECK(!g_tpm_token_loader);
   g_tpm_token_loader = new TPMTokenLoader(true /*for_test*/);
 }
 
@@ skipping 231 matching lines @@
   }
   tpm_ready_callback_list_.clear();
 }
 
 void TPMTokenLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeStartTokenInitialization();
 }
 
 }  // namespace chromeos