Enable --high-dpi-support by default.

chrome/browser/history/history_backend_unittest.cc

Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index b6230b38fc7c0eb5daf911504b07f148db81813b..4468b5bc1200f83b89d8bfcd232d0f038e615d02 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -41,6 +41,9 @@
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
+#if defined(OS_WIN)
+#include "ui/gfx/win/dpi.h"
+#endif
 
 using base::Time;
 
@@ -2173,6 +2176,11 @@ TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconBitmapsPerIconURL) {
 // Tests that the favicon set by MergeFavicon() shows up in the result of
 // GetFaviconsForURL().
 TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {
+#if defined(OS_WIN)
+  // High DPI breaks multi-resolution handling. Bail.
+  if (gfx::IsHighDPIEnabled())
+    return;
+#endif
   GURL page_url("http://www.google.com");
   GURL icon_url("http://www.google.com/favicon.ico");
   GURL merged_icon_url("http://wwww.google.com/favicon2.ico");
@@ -2465,8 +2473,12 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSelectClosestMatch) {
 // Test that GetFaviconsFromDB() returns results from the icon URL whose
 // bitmaps most closely match the passed in desired size and scale factors.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBSingleIconURL) {
+#if defined(OS_WIN)
+  // High DPI breaks multi-resolution handling. Bail.
+  if (gfx::IsHighDPIEnabled())
+    return;
+#endif
   const GURL page_url("http://www.google.com/");
-
   const GURL icon_url1("http://www.google.com/icon1");
   const GURL icon_url2("http://www.google.com/icon2");