Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Unified Diff: views/controls/tabbed_pane/tabbed_pane_unittest.cc

Issue 8560002: Disable TabbedPaneTest.SizeAndLayout on windows as it is failing on Win7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/tabbed_pane/tabbed_pane_unittest.cc
===================================================================
--- views/controls/tabbed_pane/tabbed_pane_unittest.cc (revision 109834)
+++ views/controls/tabbed_pane/tabbed_pane_unittest.cc (working copy)
@@ -66,8 +66,15 @@
DISALLOW_COPY_AND_ASSIGN(TabbedPaneTest);
};
+#if defined(OS_WIN)
+// This test is failing and crashes on Win7. See http://crbug.com/104067
+#define MAYBE_SizeAndLayout DISABLED_SizeAndLayout
+#else
+#define MAYBE_SizeAndLayout SizeAndLayout
+#endif
+
// Tests that TabbedPane::GetPreferredSize() and TabbedPane::Layout().
-TEST_F(TabbedPaneTest, SizeAndLayout) {
+TEST_F(TabbedPaneTest, MAYBE_SizeAndLayout) {
View* child1 = new FixedSizeView(gfx::Size(20, 10));
tabbed_pane_->AddTab(ASCIIToUTF16("tab1"), child1);
View* child2 = new FixedSizeView(gfx::Size(5, 5));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698