Set desired_image_size when decoding images for NTP Tile icons.

chrome/browser/image_decoder_browsertest.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/image_decoder.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 169 matching lines @@
                                  ImageDecoder::ROBUST_PNG_CODEC,
                                  false /* shrink_to_fit */);
   runner->Run();
   EXPECT_TRUE(test_request.decode_succeeded());
 }
 
 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 so please?

  /*shrink_to_fit=*/false

clang-format knows not to put a space between the comment and the thing after it
when the comment ends in =, and this way it's clear that shrink_to_fit is set to
false. Currently it could also mean "we pass false for this parameter, which has
the effect of enabling shrink to fit".

IMO the /* desired_image_frame_size */ comment doesn't add much, i'd just omit
that one.

Also for the rest of this file.

[tschumann, 2017/03/02 16:25:51]

I left the comment for desired_image_frame_size for consistency with
shrink_to_fit.
Changed the comment styles (nice benefit: clang-tidy checks know about it and
make sure they stay in sync
(https://g3doc.corp.google.com/devtools/cymbal/clang_tidy/g3doc/checks/misc-ar...)

   runner->Run();
   EXPECT_TRUE(test_request.decode_succeeded());
 }
 
 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());
 }
 
 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());
 }
 
 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());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, BasicDecode) {
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
@@ skipping 35 matching lines @@
       new content::MessageLoopRunner;
   TestImageRequest test_request(runner->QuitClosure());
   ImageDecoder::Start(&test_request, GetValidPngData());
   runner->Run();
   if (!test_request.decode_succeeded()) {
     // The UI thread won the race. Make sure the utility process did get killed.
     EXPECT_TRUE(observer.did_kill());
   }
   // Else the IO thread won the race and the image got decoded. Oh well.
 }