Convert encryptor.cc and friends to string16.

Convert encryptor.cc and friends to string16.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10740

[dsh, 2009-02-28 03:44:20]

LGTM if you fix the stuff below.

Thanks.

http://codereview.chromium.org/28292/diff/1003/16
File base/logging.h (right):

http://codereview.chromium.org/28292/diff/1003/16#newcode584
Line 584: #if defined(OS_POSIX)
I would use #if !defined(WCHAR_T_IS_UTF16) so it is the same condition as what
makes string16 and std::wstring the same type.

http://codereview.chromium.org/28292/diff/1003/16#newcode587
Line 587: std::ostream& operator<<(std::ostream& out, const string16* str16);
Why do we need to output string16* ?  The one above it is for wchar_t*, not
wstring*, so maybe this should be char16* if it's even needed at all.

http://codereview.chromium.org/28292/diff/1003/19
File chrome/browser/password_manager/encryptor.cc (right):

http://codereview.chromium.org/28292/diff/1003/19#newcode24
Line 24: *plaintext = UTF8ToUTF16(utf8);
Maybe use plaintext->assign().

http://codereview.chromium.org/28292/diff/1003/20
File chrome/browser/password_manager/encryptor.h (right):

http://codereview.chromium.org/28292/diff/1003/20#newcode16
Line 16: // Encrypt a wstring. The output (second argument) is
Fix the comment.

http://codereview.chromium.org/28292/diff/1003/18
File chrome/browser/password_manager/encryptor_unittest.cc (right):

http://codereview.chromium.org/28292/diff/1003/18#newcode27
Line 27: plaintext = WideToUTF16(L"hello");
Might as well use ASCIIToUTF16 with a char string literal.

http://codereview.chromium.org/28292/diff/1003/17
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/28292/diff/1003/17#newcode644
Line 644: Encryptor::EncryptString16(WideToUTF16(form.password_value),
Please use WideToUTF16Hack to flag that form.password_value should be ported to
string16.

http://codereview.chromium.org/28292/diff/1003/17#newcode680
Line 680: Encryptor::EncryptString16(WideToUTF16(form.password_value),
Same here.

http://codereview.chromium.org/28292/diff/1003/17#newcode772
Line 772: form->password_value = UTF16ToWide(decrypted_password);
... and here.

[dsh, 2009-02-28 04:20:22]

Wait, please hold off on the LGTM until the logging thing is fixed.  Sorry 'bout
that.

http://codereview.chromium.org/28292/diff/1003/16
File base/logging.h (right):

http://codereview.chromium.org/28292/diff/1003/16#newcode589
Line 589: return out << str16;
Oh, and isn't this infinitely recursive?  I'm not sure what the best place to
put this is.  Probably string16.h is better so we don't have to include more
files in logging.h.

[Lei Zhang, 2009-03-02 22:19:28]

Please review patch set 3.

http://codereview.chromium.org/28292/diff/1003/16
File base/logging.h (right):

http://codereview.chromium.org/28292/diff/1003/16#newcode589
Line 589: return out << str16;
On 2009/02/28 04:20:22, dsh wrote:
> Oh, and isn't this infinitely recursive?  I'm not sure what the best place to
> put this is.  Probably string16.h is better so we don't have to include more
> files in logging.h.

Umm, yes. *hangs head in shame* Next revision moves this out to base/string16.*

http://codereview.chromium.org/28292/diff/1003/20
File chrome/browser/password_manager/encryptor.h (right):

http://codereview.chromium.org/28292/diff/1003/20#newcode16
Line 16: // Encrypt a wstring. The output (second argument) is
On 2009/02/28 03:44:21, dsh wrote:
> Fix the comment.

Done.

http://codereview.chromium.org/28292/diff/1003/18
File chrome/browser/password_manager/encryptor_unittest.cc (right):

http://codereview.chromium.org/28292/diff/1003/18#newcode27
Line 27: plaintext = WideToUTF16(L"hello");
On 2009/02/28 03:44:21, dsh wrote:
> Might as well use ASCIIToUTF16 with a char string literal.

Done.

http://codereview.chromium.org/28292/diff/1003/17
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/28292/diff/1003/17#newcode644
Line 644: Encryptor::EncryptString16(WideToUTF16(form.password_value),
On 2009/02/28 03:44:21, dsh wrote:
> Please use WideToUTF16Hack to flag that form.password_value should be ported
to
> string16.

done.

http://codereview.chromium.org/28292/diff/1003/17#newcode680
Line 680: Encryptor::EncryptString16(WideToUTF16(form.password_value),
On 2009/02/28 03:44:21, dsh wrote:
> Same here.

done.

http://codereview.chromium.org/28292/diff/1003/17#newcode772
Line 772: form->password_value = UTF16ToWide(decrypted_password);
On 2009/02/28 03:44:21, dsh wrote:
> ... and here.

Done.

[dsh, 2009-03-02 22:30:21]

LGTM