Fix IE password import

components/webdata/encryptor/ie7_password_unittest_win.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 "testing/gtest/include/gtest/gtest.h"
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/strings/string16.h"

[Lei Zhang, 2013/10/08 17:49:46]

no longer used, remove?

 #include "components/webdata/encryptor/ie7_password.h"
 
 TEST(IE7PasswordTest, GetUserPassword) {
   // This is the unencrypted values of my keys under Storage2.
   // The passwords have been manually changed to abcdef... but the size remains
   // the same.
   unsigned char data1[] = "\x0c\x00\x00\x00\x38\x00\x00\x00\x2c\x00\x00\x00"
                           "\x57\x49\x43\x4b\x18\x00\x00\x00\x02\x00\x00\x00"
                           "\x67\x00\x72\x00\x01\x00\x00\x00\x00\x00\x00\x00"
                           "\x00\x00\x00\x00\x4e\xfa\x67\x76\x22\x94\xc8\x01"
@@ skipping 17 matching lines @@
 
 
   std::vector<unsigned char> decrypted_data1;
   decrypted_data1.resize(arraysize(data1));
   memcpy(&decrypted_data1.front(), data1, sizeof(data1));
 
   std::vector<unsigned char> decrypted_data2;
   decrypted_data2.resize(arraysize(data2));
   memcpy(&decrypted_data2.front(), data2, sizeof(data2));
 
-  string16 password;
-  string16 username;
-  ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data1, &username,
-                                                &password));
-  EXPECT_EQ(L"abcdefgh", username);
-  EXPECT_EQ(L"abcdefghijkl", password);
+  std::vector<ie7_password::DecryptedCredentials> credentials;
+  ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data1, &credentials));
+  ASSERT_EQ(1u, credentials.size());
+  EXPECT_EQ(L"abcdefgh", credentials[0].username);
+  EXPECT_EQ(L"abcdefghijkl", credentials[0].password);
 
-  ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data2, &username,
-                                                &password));
-  EXPECT_EQ(L"abcdefghi", username);
-  EXPECT_EQ(L"abcdefg", password);
+  credentials.clear();
+  ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data2, &credentials));
+  ASSERT_EQ(1u, credentials.size());
+  EXPECT_EQ(L"abcdefghi", credentials[0].username);
+  EXPECT_EQ(L"abcdefg", credentials[0].password);
 }
+
+TEST(IE7PasswordTest, GetThreeUserPasswords) {
+  // Unencrypted binary data holding 3 sets of credentials
+  unsigned char data[] =

[Lei Zhang, 2013/10/08 17:49:46]

nit - This should be: const unsigned char kData[], ditto in the original test.

+      "\x0c\x00\x00\x00\x78\x00\x00\x00\x48\x00\x00\x00\x57\x49\x43\x4b\x18"
+      "\x00\x00\x00\x06\x00\x00\x00\x5c\x00\x55\x00\x01\x00\x00\x00\x00\x00"
+      "\x00\x00\x00\x00\x00\x00\xc3\xf2\x4b\xda\x1d\xc4\xce\x01\x04\x00\x00"
+      "\x00\x0a\x00\x00\x00\xc3\xf2\x4b\xda\x1d\xc4\xce\x01\x06\x00\x00\x00"
+      "\x18\x00\x00\x00\xbe\x5e\xe9\xe1\x1d\xc4\xce\x01\x04\x00\x00\x00\x22"
+      "\x00\x00\x00\xbe\x5e\xe9\xe1\x1d\xc4\xce\x01\x06\x00\x00\x00\x30\x00"
+      "\x00\x00\x07\x50\x1f\xe6\x1d\xc4\xce\x01\x04\x00\x00\x00\x3a\x00\x00"
+      "\x00\x07\x50\x1f\xe6\x1d\xc4\xce\x01\x06\x00\x00\x00\x71\x00\x77\x00"
+      "\x65\x00\x72\x00\x00\x00\x71\x00\x77\x00\x65\x00\x72\x00\x74\x00\x79"
+      "\x00\x00\x00\x61\x00\x73\x00\x64\x00\x66\x00\x00\x00\x61\x00\x73\x00"
+      "\x64\x00\x66\x00\x67\x00\x68\x00\x00\x00\x7a\x00\x78\x00\x63\x00\x76"
+      "\x00\x00\x00\x7a\x00\x78\x00\x63\x00\x76\x00\x62\x00\x6e\x00\x00\x00";
+

[Lei Zhang, 2013/10/08 17:49:46]

nit: only 1 blank line, ditto in the above test.

+
+  std::vector<unsigned char> decrypted_data;
+  decrypted_data.resize(arraysize(data));
+  memcpy(&decrypted_data.front(), data, sizeof(data));
+
+  std::vector<ie7_password::DecryptedCredentials> credentials;
+  ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data, &credentials));
+  ASSERT_EQ(3u, credentials.size());
+  EXPECT_EQ(L"qwer", credentials[0].username);
+  EXPECT_EQ(L"qwerty", credentials[0].password);
+  EXPECT_EQ(L"asdf", credentials[1].username);
+  EXPECT_EQ(L"asdfgh", credentials[1].password);
+  EXPECT_EQ(L"zxcv", credentials[2].username);
+  EXPECT_EQ(L"zxcvbn", credentials[2].password);
+}