diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 02:31:03 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 02:31:03 +0000 |
| commit | b026e35d56ca317e00fa54864e7f869be62e99d9 (patch) | |
| tree | e9a32e7cc2d0574cf3ef29a0f4e75b7fc3cde6c6 /base/crypto | |
| parent | 12a94ea157a6326c835f6dc9bca3a2332b911606 (diff) | |
| download | chromium_src-b026e35d56ca317e00fa54864e7f869be62e99d9.zip chromium_src-b026e35d56ca317e00fa54864e7f869be62e99d9.tar.gz chromium_src-b026e35d56ca317e00fa54864e7f869be62e99d9.tar.bz2 | |
Reland r62959 without the changes to histogram.cc, in hopes it won't break tab_switching_test, and without the changes to tools_sanity_unittest.cc, which have already been relanded separately.
TBR=timsteele
Original changelog message:
Convert LOG(INFO) to VLOG(1) - base/.
Also removes an "else" after "return" and aligns "<<" per style guide.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3850007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto')
| -rw-r--r-- | base/crypto/symmetric_key_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/crypto/symmetric_key_unittest.cc b/base/crypto/symmetric_key_unittest.cc index 023179d..664bcb5 100644 --- a/base/crypto/symmetric_key_unittest.cc +++ b/base/crypto/symmetric_key_unittest.cc @@ -200,7 +200,7 @@ TEST(SymmetricKeyTest, DeriveKeyFromPassword) { // The OS X crypto libraries have minimum salt and iteration requirements // so some of the above tests will cause them to barf. Skip these. if (strlen(test_vectors[i].salt) < 8 || test_vectors[i].rounds < 1000) { - LOG(INFO) << "Skipped test vector #" << i; + VLOG(1) << "Skipped test vector #" << i; continue; } #endif // OS_MACOSX |