Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323

username_passkey_unittest.cc

Index: username_passkey_unittest.cc
diff --git a/username_passkey_unittest.cc b/username_passkey_unittest.cc
index 9d406496e83888a43dd76c8b06afe9642a22a2bd..74d1e48ed8d7c7b739bbe56e753cc3bbe1d5e9b5 100644
--- a/username_passkey_unittest.cc
+++ b/username_passkey_unittest.cc
@@ -4,16 +4,15 @@
 
 // Unit tests for UsernamePasskey.
 
-#include "cryptohome/username_passkey.h"
+#include "username_passkey.h"
 
-#include <gtest/gtest.h>
 #include <string.h>  // For memset(), memcpy()
-#include <string>
 
-#include "chromeos/utility.h"
+#include <chromeos/utility.h>
+#include <gtest/gtest.h>
+#include <string>
 
 namespace cryptohome {
-using namespace chromeos;
 
 const char kFakeUser[] = "fakeuser";
 const char kFakePasskey[] = "176c1e698b521373d77ce655d2e56a1d";
@@ -21,13 +20,19 @@ const char kFakePasskey[] = "176c1e698b521373d77ce655d2e56a1d";
 // salt must have even number of characters.
 const char kFakeSystemSalt[] = "01234567890123456789";
 
-class UsernamePasskeyTest : public ::testing::Test { };
+class UsernamePasskeyTest : public ::testing::Test {
+ public:
+  UsernamePasskeyTest() { }
+  virtual ~UsernamePasskeyTest() { }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UsernamePasskeyTest);
+};
 
 TEST(UsernamePasskeyTest, GetFullUsernameTest) {
   char username[80];
   snprintf(username, sizeof(username), "%s%s", kFakeUser, "@gmail.com");
-  UsernamePasskey up(username, strlen(username),
-                      kFakePasskey, strlen(kFakePasskey));
+  UsernamePasskey up(username, SecureBlob(kFakePasskey, strlen(kFakePasskey)));
   char full_username[80];
   up.GetFullUsername(full_username, sizeof(full_username));
   EXPECT_EQ(0, strcmp(username, full_username));
@@ -36,29 +41,27 @@ TEST(UsernamePasskeyTest, GetFullUsernameTest) {
 TEST(UsernamePasskeyTest, GetPartialUsernameTest) {
   char username[80];
   snprintf(username, sizeof(username), "%s%s", kFakeUser, "@gmail.com");
-  UsernamePasskey up(username, strlen(username),
-                      kFakePasskey, strlen(kFakePasskey));
+  UsernamePasskey up(username, SecureBlob(kFakePasskey, strlen(kFakePasskey)));
   char partial_username[80];
   up.GetPartialUsername(partial_username, sizeof(partial_username));
   EXPECT_EQ(0, strcmp(kFakeUser, partial_username));
 }
 
 TEST(UsernamePasskeyTest, GetObfuscatedUsernameTest) {
-  UsernamePasskey up(kFakeUser, strlen(kFakeUser),
-                      kFakePasskey, strlen(kFakePasskey));
+  UsernamePasskey up(kFakeUser, SecureBlob(kFakePasskey, strlen(kFakePasskey)));
 
-  Blob fake_salt(AsciiDecode(kFakeSystemSalt));
+  chromeos::Blob fake_salt(chromeos::AsciiDecode(kFakeSystemSalt));
 
   EXPECT_EQ("bb0ae3fcd181eefb861b4f0ee147a316e51d9f04",
             up.GetObfuscatedUsername(fake_salt));
 }
 
 TEST(UsernamePasskeyTest, GetPasskeyTest) {
-  UsernamePasskey up(kFakeUser, strlen(kFakeUser),
-                      kFakePasskey, strlen(kFakePasskey));
-  Blob passkey = up.GetPasskey();
+  UsernamePasskey up(kFakeUser, SecureBlob(kFakePasskey, strlen(kFakePasskey)));
+  SecureBlob passkey;
+  up.GetPasskey(&passkey);
   EXPECT_EQ(strlen(kFakePasskey), passkey.size());
   EXPECT_EQ(0, memcmp(kFakePasskey, &passkey[0], passkey.size()));
 }
 
-}  // cryptohome
+}  // namespace cryptohome