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

Side by Side Diff: chromeos/tpm/tpm_token_loader.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromeos/tpm/tpm_token_loader.h" 5 #include "chromeos/tpm/tpm_token_loader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // static 46 // static
47 void TPMTokenLoader::Shutdown() { 47 void TPMTokenLoader::Shutdown() {
48 CHECK(g_tpm_token_loader); 48 CHECK(g_tpm_token_loader);
49 delete g_tpm_token_loader; 49 delete g_tpm_token_loader;
50 g_tpm_token_loader = NULL; 50 g_tpm_token_loader = NULL;
51 } 51 }
52 52
53 // static 53 // static
54 TPMTokenLoader* TPMTokenLoader::Get() { 54 TPMTokenLoader* TPMTokenLoader::Get() {
55 CHECK(g_tpm_token_loader) 55 // TPMTokenLoader::Get() called before Initialize()
56 << "TPMTokenLoader::Get() called before Initialize()"; 56 CHECK(g_tpm_token_loader);
57 return g_tpm_token_loader; 57 return g_tpm_token_loader;
58 } 58 }
59 59
60 // static 60 // static
61 bool TPMTokenLoader::IsInitialized() { 61 bool TPMTokenLoader::IsInitialized() {
62 return g_tpm_token_loader; 62 return g_tpm_token_loader;
63 } 63 }
64 64
65 TPMTokenLoader::TPMTokenLoader(bool for_test) 65 TPMTokenLoader::TPMTokenLoader(bool for_test)
66 : initialized_for_test_(for_test), 66 : initialized_for_test_(for_test),
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 229 }
230 tpm_ready_callback_list_.clear(); 230 tpm_ready_callback_list_.clear();
231 } 231 }
232 232
233 void TPMTokenLoader::LoggedInStateChanged() { 233 void TPMTokenLoader::LoggedInStateChanged() {
234 VLOG(1) << "LoggedInStateChanged"; 234 VLOG(1) << "LoggedInStateChanged";
235 MaybeStartTokenInitialization(); 235 MaybeStartTokenInitialization();
236 } 236 }
237 237
238 } // namespace chromeos 238 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698