diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 18:37:28 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 18:37:28 +0000 |
| commit | 7b9fc9c9e84c6ecc21d61693ed93c3d919a5085f (patch) | |
| tree | 71b64d5dbd61b1fb76b913b65df506c520ca90f5 /content/renderer/bmp_image_decoder_unittest.cc | |
| parent | 84fd4d94c89d492720237af71498f71df1241be2 (diff) | |
| download | chromium_src-7b9fc9c9e84c6ecc21d61693ed93c3d919a5085f.zip chromium_src-7b9fc9c9e84c6ecc21d61693ed93c3d919a5085f.tar.gz chromium_src-7b9fc9c9e84c6ecc21d61693ed93c3d919a5085f.tar.bz2 | |
Fix ImageDecoder tests to allow MD5 sum calculation to compile again.
This also fixes a variety of style errors (e.g. incorrect wrapping/indenting or
use of protected data members), and cleans up the code some (e.g. by bailing
early for invalid images in MD5 sum generation mode).
BUG=none
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/213543003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/bmp_image_decoder_unittest.cc')
| -rw-r--r-- | content/renderer/bmp_image_decoder_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index 666196a..a249126 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -26,7 +26,7 @@ TEST_F(BMPImageDecoderTest, DecodingFast) { } #if defined(THREAD_SANITIZER) -// BMPImageDecoderTest.DecodingSlow als times out under ThreadSanitizer v2. +// BMPImageDecoderTest.DecodingSlow always times out under ThreadSanitizer v2. #define MAYBE_DecodingSlow DISABLED_DecodingSlow #else #define MAYBE_DecodingSlow DecodingSlow |