Fix IE password import

components/webdata/encryptor/ie7_password.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef COMPONENTS_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_
 #define COMPONENTS_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_
 
 #include <windows.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 
 // Contains the information read from the IE7/IE8 Storage2 key in the registry.
 struct IE7PasswordInfo {
   // Hash of the url.
   std::wstring url_hash;
 
   // Encrypted data containing the username, password and some more undocumented
   // fields.
   std::vector<unsigned char> encrypted_data;
 
   // When the login was imported.
   base::Time date_created;
 };
 
 namespace ie7_password {
 
-// Parses a data structure to find the password and the username.
+struct DecryptedCredentials {
+  DecryptedCredentials();

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

nit: we generally don't bother with ctor/dtors for structs. e.g. IE7PasswordInfo
above on line 16.

+  ~DecryptedCredentials();
+
+  std::wstring username;

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

There exists a presubmit check to prevent std::wstring use. However, we know in
this case it's ok. You'll have to write it this way to pacify the presubmit
check:

// presubmit: allow wstring
std:wstring username;

+  std::wstring password;
+};
+
+// Parses a data structure to find passwords and usernames.

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

Can you mention the format of |data| and mention |credentials| is where the
results go?

 bool GetUserPassFromData(const std::vector<unsigned char>& data,
-                         std::wstring* username,
-                         std::wstring* password);
+                         std::vector<DecryptedCredentials>* credentials);
 
-// Decrypts the username and password for a given data vector using the url as
+// Decrypts usernames and passwords for a given data vector using the url as
 // the key.
-bool DecryptPassword(const std::wstring& url,
-                     const std::vector<unsigned char>& data,
-                     std::wstring* username, std::wstring* password);
+bool DecryptPasswords(const std::wstring& url,
+                      const std::vector<unsigned char>& data,
+                      std::vector<DecryptedCredentials>* credentials);
 
 // Returns the hash of a url.
 std::wstring GetUrlHash(const std::wstring& url);
 
 }  // namespace ie7_password
 
 #endif  // COMPONENTS_WEBDATA_ENCRYPTOR_IE7_PASSWORD_H_