Index: chrome/browser/ui/panels/panel_browsertest.cc |
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc |
index 82c27f242cb6d32b50bba4ef9644b3c553c5ccd8..e2239660dd3293e6bb8bb85b4507d3f07e506103 100644 |
--- a/chrome/browser/ui/panels/panel_browsertest.cc |
+++ b/chrome/browser/ui/panels/panel_browsertest.cc |
@@ -834,6 +834,11 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateSettingsMenu) { |
"http://home", "options.html"); |
} |
+#if defined(OS_WIN) || defined(OS_MACOSX) |
+#define MAYBE_AutoResize AutoResize |
+#else |
+#define MAYBE_AutoResize FLAKY_AutoResize |
+#endif |
IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AutoResize) { |
jennb
2011/11/28 19:59:09
Forgot MAYBE_ prefix
dcheng
2011/11/28 20:01:20
I fixed it when I actually landed it.
|
PanelManager::GetInstance()->enable_auto_sizing(true); |
set_testing_work_area(gfx::Rect(0, 0, 1200, 900)); |