1 files changed, 5 insertions, 34 deletions
diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc
index 27d1b8a..b38e73e 100644
--- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc
@@ -14,24 +14,6 @@
 
 using content::BrowserThread;
 
-namespace {
-void GetNSSUtilInfoOnIOThread(const base::Callback<
-    void(bool, const std::string&, const std::string&)>& ui_callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  bool is_tpm_ready = crypto::IsTPMTokenReady();
-  std::string token_name;
-  std::string user_pin;
-  if (is_tpm_ready)
-    crypto::GetTPMTokenInfo(&token_name, &user_pin);
-
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(ui_callback, is_tpm_ready, token_name, user_pin));
-}
-}  // namespace
-
 namespace chromeos {
 
 CryptohomeWebUIHandler::CryptohomeWebUIHandler() : weak_ptr_factory_(this) {}
@@ -58,31 +40,20 @@ void CryptohomeWebUIHandler::OnPageLoaded(const base::ListValue* args) {
   cryptohome_client->Pkcs11IsTpmTokenReady(
       GetCryptohomeBoolCallback("pkcs11-is-tpm-token-ready"));
 
-  BrowserThread::PostTask(
+  BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::IO,
       FROM_HERE,
-      base::Bind(
-          &GetNSSUtilInfoOnIOThread,
-          base::Bind(&CryptohomeWebUIHandler::DidGetNSSUtilInfoOnUIThread,
-                     weak_ptr_factory_.GetWeakPtr())));
+      base::Bind(&crypto::IsTPMTokenReady),
+      base::Bind(&CryptohomeWebUIHandler::DidGetNSSUtilInfoOnUIThread,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void CryptohomeWebUIHandler::DidGetNSSUtilInfoOnUIThread(
-    bool is_tpm_token_ready,
-    const std::string& token_name,
-    const std::string& user_pin) {
+    bool is_tpm_token_ready) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   base::FundamentalValue is_tpm_token_ready_value(is_tpm_token_ready);
   SetCryptohomeProperty("is-tpm-token-ready", is_tpm_token_ready_value);
-
-  if (is_tpm_token_ready) {
-    base::StringValue token_name_value(token_name);
-    SetCryptohomeProperty("token-name", token_name_value);
-    // Hide user_pin.
-    base::StringValue user_pin_value(std::string(user_pin.length(), '*'));
-    SetCryptohomeProperty("user-pin", user_pin_value);
-  }
 }
 
 BoolDBusMethodCallback CryptohomeWebUIHandler::GetCryptohomeBoolCallback(