chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady

chrome/browser/ui/webui/about_ui.cc

Index: chrome/browser/ui/webui/about_ui.cc
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 71980a63f6aa5bf69ef82d10296b5ca474e0e5ab..4d4376948bce0416fe4aa7d61fda1e55db3f4295 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -55,7 +55,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/process_type.h"
-#include "crypto/nss_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
@@ -82,14 +81,11 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/oom_priority_manager.h"
 #include "chrome/browser/chromeos/version_loader.h"
-#include "chromeos/dbus/cryptohome_client.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 #if defined(USE_ASH)
@@ -506,13 +502,6 @@ std::string AboutNetwork(const std::string& query) {
   return GetNetworkHtmlInfo(refresh);
 }
 
-std::string AddBoolRow(const std::string& name, bool value) {
-  std::string row;
-  row.append(WrapWithTD(name));
-  row.append(WrapWithTD(value ? "true" : "false"));
-  return WrapWithTR(row);
-}
-
 std::string AddStringRow(const std::string& name, const std::string& value) {
   std::string row;
   row.append(WrapWithTD(name));
@@ -520,59 +509,6 @@ std::string AddStringRow(const std::string& name, const std::string& value) {
   return WrapWithTR(row);
 }
 
-void FinishCryptohomeDataRequestInternal(
-    scoped_refptr<AboutUIHTMLSource> source,
-    int refresh,
-    int request_id,
-    chromeos::DBusMethodCallStatus call_status,
-    bool is_tpm_token_ready) {
-  if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS)
-    is_tpm_token_ready = false;
-
-  chromeos::CryptohomeLibrary* cryptohome =
-      chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
-  std::string output;
-  AppendHeader(&output, refresh, "About Cryptohome");
-  AppendBody(&output);
-  AppendRefresh(&output, refresh, "cryptohome");
-
-  output.append("<h3>CryptohomeLibrary:</h3>");
-  output.append("<table>");
-  output.append(AddBoolRow("IsMounted", cryptohome->IsMounted()));
-  output.append(AddBoolRow("TpmIsReady", cryptohome->TpmIsReady()));
-  output.append(AddBoolRow("TpmIsEnabled", cryptohome->TpmIsEnabled()));
-  output.append(AddBoolRow("TpmIsOwned", cryptohome->TpmIsOwned()));
-  output.append(AddBoolRow("TpmIsBeingOwned", cryptohome->TpmIsBeingOwned()));
-  output.append(AddBoolRow("Pkcs11IsTpmTokenReady", is_tpm_token_ready));
-  output.append("</table>");
-
-  output.append("<h3>crypto:</h3>");
-  output.append("<table>");
-  output.append(AddBoolRow("IsTPMTokenReady", crypto::IsTPMTokenReady()));
-  std::string token_name, user_pin;
-  if (crypto::IsTPMTokenReady())
-    crypto::GetTPMTokenInfo(&token_name, &user_pin);
-  output.append(AddStringRow("token_name", token_name));
-  output.append(AddStringRow("user_pin", std::string(user_pin.length(), '*')));
-  output.append("</table>");
-  AppendFooter(&output);
-
-  source->FinishDataRequest(output, request_id);
-}
-
-void FinishCryptohomeDataRequest(scoped_refptr<AboutUIHTMLSource> source,
-                                 const std::string& query,
-                                 int request_id) {
-  int refresh;
-  base::StringToInt(query, &refresh);
-
-  chromeos::DBusThreadManager::Get()->GetCryptohomeClient()->
-      Pkcs11IsTpmTokenReady(base::Bind(&FinishCryptohomeDataRequestInternal,
-                                       source,
-                                       refresh,
-                                       request_id));
-}
-
 std::string AboutDiscardsRun() {
   std::string output;
   AppendHeader(&output, 0, "About discards");
@@ -1364,9 +1300,6 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path,
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
         idr, ui::SCALE_FACTOR_NONE).as_string();
 #if defined(OS_CHROMEOS)
-  } else if (host == chrome::kChromeUICryptohomeHost) {
-    FinishCryptohomeDataRequest(this, path, request_id);
-    return;
   } else if (host == chrome::kChromeUIDiscardsHost) {
     response = AboutDiscards(path);
 #endif