Index: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc |
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc |
index 1aacf4982c8d1bbbdb4d7261baff454ce1356af5..7ac0c4207c6283dcbcfdfd54b3df92c441c99878 100644 |
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc |
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc |
@@ -32,6 +32,9 @@ |
#include "ui/gfx/rect.h" |
#include "ui/gfx/size.h" |
#include "ui/gfx/skia_util.h" |
+#if defined(OS_WIN) |
+#include "ui/gfx/win/dpi.h" |
+#endif |
using content::WebContents; |
@@ -124,6 +127,12 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { |
} |
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) { |
+#if defined(OS_WIN) |
+ // High DPI breaks multi-resolution handling. Bail. |
+ if (gfx::IsHighDPIEnabled()) |
+ return; |
+#endif |
+ |
ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_; |
const Extension* extension = GetSingleLoadedExtension(); |
ASSERT_TRUE(extension) << message_; |