Commit 510f08bd authored by nsylvain@chromium.org's avatar nsylvain@chromium.org

Disable TabbedPaneTest.SizeAndLayout on windows as it is failing on Win7.

BUG:104067
TBR:mnissler
Review URL: http://codereview.chromium.org/8560002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109835 0039d316-1c4b-4281-b951-d872f2087c98
parent dca90f96
......@@ -66,8 +66,15 @@ class TabbedPaneTest : public testing::Test,
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));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment