chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady

chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc

+// Copyright (c) 2012 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 "chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h"
+
+#include "base/bind.h"
+#include "base/values.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "content/public/browser/web_ui.h"
+#include "crypto/nss_util.h"
+
+namespace chromeos {
+
+CryptohomeWebUIHandler::CryptohomeWebUIHandler() : weak_ptr_factory_(this) {}
+
+CryptohomeWebUIHandler::~CryptohomeWebUIHandler() {}
+
+void CryptohomeWebUIHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback(
+      "pageLoaded",
+      base::Bind(&CryptohomeWebUIHandler::OnPageLoaded,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void CryptohomeWebUIHandler::OnPageLoaded(const base::ListValue* args) {
+  CryptohomeClient* cryptohome_client =
+      DBusThreadManager::Get()->GetCryptohomeClient();
+  CryptohomeLibrary* cryptohome_library =
+      CrosLibrary::Get()->GetCryptohomeLibrary();
+
+  base::FundamentalValue is_mounted(cryptohome_library->IsMounted());

[hashimoto, 2012/07/20 10:54:28]

Local variables like this |is_mounted| are needed to suppress clang's error
"C++98 requires an accessible copy constructor for class
'base::FundamentalValue' when binding a reference to a temporary"

[Evan Stade, 2012/07/20 18:29:45]

oh, that sucks.

+  SetCryptohomeProperty("is-mounted", is_mounted);
+  cryptohome_client->TpmIsReady(GetCryptohomeBoolCallback("tpm-is-ready"));
+  base::FundamentalValue tpm_is_enabled(cryptohome_library->TpmIsEnabled());
+  SetCryptohomeProperty("tpm-is-enabled", tpm_is_enabled);
+  base::FundamentalValue tpm_is_owned(cryptohome_library->TpmIsOwned());
+  SetCryptohomeProperty("tpm-is-owned", tpm_is_owned);
+  base::FundamentalValue tpm_is_being_owned(
+      cryptohome_library->TpmIsBeingOwned());
+  SetCryptohomeProperty("tpm-is-being-owned", tpm_is_being_owned);
+  cryptohome_client->Pkcs11IsTpmTokenReady(
+      GetCryptohomeBoolCallback("pkcs11-is-tpm-token-ready"));
+  base::FundamentalValue is_tpm_token_ready(crypto::IsTPMTokenReady());
+  SetCryptohomeProperty("is-tpm-token-ready", is_tpm_token_ready);
+
+  std::string token_name;

[Evan Stade, 2012/07/20 18:29:45]

declare inside the if block

[hashimoto, 2012/07/23 04:33:24]

Done.

+  std::string user_pin;
+  if (crypto::IsTPMTokenReady()) {
+    crypto::GetTPMTokenInfo(&token_name, &user_pin);
+    // Hide user_pin.
+    user_pin = std::string(user_pin.length(), '*');
+    base::StringValue token_name_value(token_name);
+    SetCryptohomeProperty("token-name", token_name_value);
+    base::StringValue user_pin_value(user_pin);
+    SetCryptohomeProperty("user-pin", user_pin_value);
+  }
+}
+
+CryptohomeClient::BoolMethodCallback
+CryptohomeWebUIHandler::GetCryptohomeBoolCallback(
+    const std::string& destination_id) {
+  return base::Bind(&CryptohomeWebUIHandler::OnCryptohomeBoolProperty,
+                    weak_ptr_factory_.GetWeakPtr(),
+                    destination_id);
+}
+
+void CryptohomeWebUIHandler::OnCryptohomeBoolProperty(
+    const std::string& destination_id,
+    DBusMethodCallStatus call_status,
+    bool value) {
+  if (call_status != DBUS_METHOD_CALL_SUCCESS)
+    value = false;
+  base::FundamentalValue fundamental_value(value);
+  SetCryptohomeProperty(destination_id, fundamental_value);
+}
+
+void CryptohomeWebUIHandler::SetCryptohomeProperty(
+    const std::string& destination_id,
+    const base::Value& value) {
+  base::StringValue destination_id_value(destination_id);
+  web_ui()->CallJavascriptFunction(
+      "SetCryptohomeProperty", destination_id_value, value);
+}
+
+}  // namespace chromeos