Chromium Code Reviews| Index: chrome/browser/image_decoder_browsertest.cc |
| diff --git a/chrome/browser/image_decoder_browsertest.cc b/chrome/browser/image_decoder_browsertest.cc |
| index 602e3a4f6f06650a667a7f3ca21597b4113a78f0..a9e0519eb002170932a1272f137f114737350480 100644 |
| --- a/chrome/browser/image_decoder_browsertest.cc |
| +++ b/chrome/browser/image_decoder_browsertest.cc |
| @@ -187,9 +187,9 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustJpegCodecWithJpegData) { |
| scoped_refptr<content::MessageLoopRunner> runner = |
| new content::MessageLoopRunner; |
| TestImageRequest test_request(runner->QuitClosure()); |
| - ImageDecoder::StartWithOptions(&test_request, GetValidJpgData(), |
| - ImageDecoder::ROBUST_JPEG_CODEC, |
| - false /* shrink_to_fit */); |
| + ImageDecoder::StartWithOptions( |
| + &test_request, GetValidJpgData(), ImageDecoder::ROBUST_JPEG_CODEC, |
| + false /* shrink_to_fit */, gfx::Size() /* desired_image_frame_size */); |
|
Nico
2017/03/02 14:17:11
nit: can you change the /**/ comments to look like
tschumann
2017/03/02 16:25:51
I left the comment for desired_image_frame_size fo
|
| runner->Run(); |
| EXPECT_TRUE(test_request.decode_succeeded()); |
| } |
| @@ -198,9 +198,9 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustJpegCodecWithPngData) { |
| scoped_refptr<content::MessageLoopRunner> runner = |
| new content::MessageLoopRunner; |
| TestImageRequest test_request(runner->QuitClosure()); |
| - ImageDecoder::StartWithOptions(&test_request, GetValidPngData(), |
| - ImageDecoder::ROBUST_JPEG_CODEC, |
| - false /* shrink_to_fit */); |
| + ImageDecoder::StartWithOptions( |
| + &test_request, GetValidPngData(), ImageDecoder::ROBUST_JPEG_CODEC, |
| + false /* shrink_to_fit */, gfx::Size() /* desired_image_frame_size */); |
| runner->Run(); |
| // Should fail with PNG data because only JPEG data is allowed. |
| EXPECT_FALSE(test_request.decode_succeeded()); |
| @@ -210,9 +210,9 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustPngCodecWithPngData) { |
| scoped_refptr<content::MessageLoopRunner> runner = |
| new content::MessageLoopRunner; |
| TestImageRequest test_request(runner->QuitClosure()); |
| - ImageDecoder::StartWithOptions(&test_request, GetValidPngData(), |
| - ImageDecoder::ROBUST_PNG_CODEC, |
| - false /* shrink_to_fit */); |
| + ImageDecoder::StartWithOptions( |
| + &test_request, GetValidPngData(), ImageDecoder::ROBUST_PNG_CODEC, |
| + false /* shrink_to_fit */, gfx::Size() /* desired_image_frame_size */); |
| runner->Run(); |
| EXPECT_TRUE(test_request.decode_succeeded()); |
| } |
| @@ -221,9 +221,9 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustPngCodecWithJpegData) { |
| scoped_refptr<content::MessageLoopRunner> runner = |
| new content::MessageLoopRunner; |
| TestImageRequest test_request(runner->QuitClosure()); |
| - ImageDecoder::StartWithOptions(&test_request, GetValidJpgData(), |
| - ImageDecoder::ROBUST_PNG_CODEC, |
| - false /* shrink_to_fit */); |
| + ImageDecoder::StartWithOptions( |
| + &test_request, GetValidJpgData(), ImageDecoder::ROBUST_PNG_CODEC, |
| + false /* shrink_to_fit */, gfx::Size() /* desired_image_frame_size */); |
| runner->Run(); |
| // Should fail with JPEG data because only PNG data is allowed. |
| EXPECT_FALSE(test_request.decode_succeeded()); |