Enable --high-dpi-support by default.

chrome/browser/history/select_favicon_frames_unittest.cc

Index: chrome/browser/history/select_favicon_frames_unittest.cc
diff --git a/chrome/browser/history/select_favicon_frames_unittest.cc b/chrome/browser/history/select_favicon_frames_unittest.cc
index d6e2fe9c00207aedba18fc549e362c67692525dd..bf9fab282d86ffb0880d424eae8a7c62ace931b1 100644
--- a/chrome/browser/history/select_favicon_frames_unittest.cc
+++ b/chrome/browser/history/select_favicon_frames_unittest.cc
@@ -9,6 +9,9 @@
 #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;
 
@@ -126,6 +129,12 @@ TEST(SelectFaviconFramesTest, _16From15) {
 }
 
 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));