Fix SelectFaviconFramesTest on Nexus 5

chrome/browser/history/select_favicon_frames_unittest.cc

 // Copyright (c) 2012 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 "components/favicon_base/select_favicon_frames.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/layout.h"
@@ skipping 179 matching lines @@
   EXPECT_EQ(1.5f, rep.scale());
   EXPECT_EQ(16, rep.GetWidth());
   EXPECT_EQ(16, rep.GetHeight());
   EXPECT_EQ(24, rep.pixel_width());
   EXPECT_EQ(24, rep.pixel_height());
   EXPECT_EQ(3u, image.image_reps().size());
 #endif
 }
 
 TEST(SelectFaviconFramesTest, ExactMatchBetterThanLargeBitmap) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 48, 48));
   CreateFaviconImageSkia(
       bitmaps1,
       SizesFromBitmaps(bitmaps1), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 32, 32));
   CreateFaviconImageSkia(bitmaps2,
       SizesFromBitmaps(bitmaps2), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, UpsampleABitBetterThanHugeBitmap) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 128, 128));
   CreateFaviconImageSkia(bitmaps1,
       SizesFromBitmaps(bitmaps1), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24));
   CreateFaviconImageSkia(bitmaps2,
@@ skipping 10 matching lines @@
   bitmaps4.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   CreateFaviconImageSkia(bitmaps4,
       SizesFromBitmaps(bitmaps4), 16, &score4);
 
   EXPECT_GT(score2, score1);
   EXPECT_GT(score3, score1);
   EXPECT_GT(score4, score1);
 }
 
 TEST(SelectFaviconFramesTest, DownsamplingBetterThanUpsampling) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8));
   CreateFaviconImageSkia(bitmaps1,
                          SizesFromBitmaps(bitmaps1), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24));
   CreateFaviconImageSkia(bitmaps2,
                          SizesFromBitmaps(bitmaps2), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, DownsamplingLessIsBetter) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 34, 34));
   CreateFaviconImageSkia(bitmaps1,
       SizesFromBitmaps(bitmaps1), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 33, 33));
   CreateFaviconImageSkia(bitmaps2,
       SizesFromBitmaps(bitmaps2), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, UpsamplingLessIsBetter) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8));
   CreateFaviconImageSkia(bitmaps1,
       SizesFromBitmaps(bitmaps1), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 9, 9));
   CreateFaviconImageSkia(bitmaps2,
       SizesFromBitmaps(bitmaps2), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 // Test that the score is determined by the |original_sizes| parameter, not the
 // |bitmaps| parameter to SelectFaviconFrames().
 TEST(SelectFaviconFramesTest, ScoreDeterminedByOriginalSizes) {
+  SCOPED_FAVICON_SCALE_FACTOR_1XAND2X;
+
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   vector<gfx::Size> sizes1;
   sizes1.push_back(gfx::Size(256, 256));
   float score1;
   CreateFaviconImageSkia(bitmaps1, sizes1, 16, &score1);
 
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   vector<gfx::Size> sizes2;
   sizes2.push_back(gfx::Size(15, 15));
   float score2;
   CreateFaviconImageSkia(bitmaps2, sizes2, 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 }  // namespace