Initial patch from Will.

src/platform/cryptohome/username_passkey_unittest.cc

Index: src/platform/cryptohome/username_passkey_unittest.cc
diff --git a/src/platform/cryptohome/username_passhash_unittest.cc b/src/platform/cryptohome/username_passkey_unittest.cc
similarity index 53%
rename from src/platform/cryptohome/username_passhash_unittest.cc
rename to src/platform/cryptohome/username_passkey_unittest.cc
index a3586738576e42dd3208770ddeb91126b45a6806..9d406496e83888a43dd76c8b06afe9642a22a2bd 100644
--- a/src/platform/cryptohome/username_passhash_unittest.cc
+++ b/src/platform/cryptohome/username_passkey_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Unit tests for UsernamePasshash.
+// Unit tests for UsernamePasskey.
 
-#include "cryptohome/username_passhash.h"
+#include "cryptohome/username_passkey.h"
 
 #include <gtest/gtest.h>
 #include <string.h>  // For memset(), memcpy()
@@ -16,36 +16,36 @@ namespace cryptohome {
 using namespace chromeos;
 
 const char kFakeUser[] = "fakeuser";
-const char kFakeHash[] = "176c1e698b521373d77ce655d2e56a1d";
+const char kFakePasskey[] = "176c1e698b521373d77ce655d2e56a1d";
 
 // salt must have even number of characters.
 const char kFakeSystemSalt[] = "01234567890123456789";
 
-class UsernamePasshashTest : public ::testing::Test { };
+class UsernamePasskeyTest : public ::testing::Test { };
 
-TEST(UsernamePasshashTest, GetFullUsernameTest) {
+TEST(UsernamePasskeyTest, GetFullUsernameTest) {
   char username[80];
   snprintf(username, sizeof(username), "%s%s", kFakeUser, "@gmail.com");
-  UsernamePasshash up(username, strlen(username),
-                      kFakeHash, strlen(kFakeHash));
+  UsernamePasskey up(username, strlen(username),
+                      kFakePasskey, strlen(kFakePasskey));
   char full_username[80];
   up.GetFullUsername(full_username, sizeof(full_username));
   EXPECT_EQ(0, strcmp(username, full_username));
 }
 
-TEST(UsernamePasshashTest, GetPartialUsernameTest) {
+TEST(UsernamePasskeyTest, GetPartialUsernameTest) {
   char username[80];
   snprintf(username, sizeof(username), "%s%s", kFakeUser, "@gmail.com");
-  UsernamePasshash up(username, strlen(username),
-                      kFakeHash, strlen(kFakeHash));
+  UsernamePasskey up(username, strlen(username),
+                      kFakePasskey, strlen(kFakePasskey));
   char partial_username[80];
   up.GetPartialUsername(partial_username, sizeof(partial_username));
   EXPECT_EQ(0, strcmp(kFakeUser, partial_username));
 }
 
-TEST(UsernamePasshashTest, GetObfuscatedUsernameTest) {
-  UsernamePasshash up(kFakeUser, strlen(kFakeUser),
-                      kFakeHash, strlen(kFakeHash));
+TEST(UsernamePasskeyTest, GetObfuscatedUsernameTest) {
+  UsernamePasskey up(kFakeUser, strlen(kFakeUser),
+                      kFakePasskey, strlen(kFakePasskey));
 
   Blob fake_salt(AsciiDecode(kFakeSystemSalt));
 
@@ -53,13 +53,12 @@ TEST(UsernamePasshashTest, GetObfuscatedUsernameTest) {
             up.GetObfuscatedUsername(fake_salt));
 }
 
-TEST(UsernamePasshashTest, GetPasshashWeakHashTest) {
-  UsernamePasshash up(kFakeUser, strlen(kFakeUser),
-                      kFakeHash, strlen(kFakeHash));
-
-  Blob fake_salt(AsciiDecode(kFakeSystemSalt));
-
-  EXPECT_EQ(kFakeHash, up.GetPasswordWeakHash(fake_salt));
+TEST(UsernamePasskeyTest, GetPasskeyTest) {
+  UsernamePasskey up(kFakeUser, strlen(kFakeUser),
+                      kFakePasskey, strlen(kFakePasskey));
+  Blob passkey = up.GetPasskey();
+  EXPECT_EQ(strlen(kFakePasskey), passkey.size());
+  EXPECT_EQ(0, memcmp(kFakePasskey, &passkey[0], passkey.size()));
 }
 
-}  // namespace cryptohome
+}  // cryptohome