Enable --high-dpi-support by default.

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"
 #include "ui/gfx/image/image_skia.h"
+#if defined(OS_WIN)
+#include "ui/gfx/win/dpi.h"
+#endif
 
 using std::vector;
 
 namespace {
 
 vector<ui::ScaleFactor> Scale1x() {
   return vector<ui::ScaleFactor>(1, ui::SCALE_FACTOR_100P);
 }
 
 vector<ui::ScaleFactor> Scale1x2x() {
@@ skipping 97 matching lines @@
   gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
       SizesFromBitmaps(bitmaps), Scale1x(), 16, NULL);
   EXPECT_EQ(1u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From16_Scale2x_32_From_16) {
+#if defined(OS_WIN)
+  // High DPI breaks multi-resolution handling. Bail.
+  if (gfx::IsHighDPIEnabled())
+    return;
+#endif
+
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
 
   gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
       SizesFromBitmaps(bitmaps), Scale1x2x(), 16, NULL);
   EXPECT_EQ(2u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   ASSERT_TRUE(image.HasRepresentation(2.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
@@ skipping 126 matching lines @@
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   vector<gfx::Size> sizes2;
   sizes2.push_back(gfx::Size(15, 15));
   float score2;
   SelectFaviconFrames(bitmaps2, sizes2, Scale1x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 }  // namespace