Fix test setup for TabbedPaneTest.

views/controls/tabbed_pane/tabbed_pane_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
+#include "views/test/views_test_base.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
 namespace views {
 
 // A view for testing that takes a fixed preferred size upon construction.
 class FixedSizeView : public View {
  public:
   FixedSizeView(const gfx::Size& size)
     : size_(size) {}
 
   virtual gfx::Size GetPreferredSize() {
     return size_;
   }
 
  private:
   const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(FixedSizeView);
 };
 
-class TabbedPaneTest : public testing::Test,
+class TabbedPaneTest : public ViewsTestBase,
                        public WidgetDelegate {
  public:
   TabbedPaneTest() {}
 
   TabbedPane* tabbed_pane_;
 
-  void RunAllPending() {
-    message_loop_.RunAllPending();
-  }
-
  private:
   virtual void SetUp() OVERRIDE {
+    ViewsTestBase::SetUp();
     tabbed_pane_ = new TabbedPane();
     window_ = Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 100, 100));
     window_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
     window_->Close();
-    message_loop_.RunAllPending();
+    ViewsTestBase::TearDown();
   }
 
   virtual views::View* GetContentsView() OVERRIDE {
     return tabbed_pane_;
   }
   virtual views::Widget* GetWidget() OVERRIDE {
     return tabbed_pane_->GetWidget();
   }
   virtual const views::Widget* GetWidget() const OVERRIDE {
     return tabbed_pane_->GetWidget();
   }
 
-  MessageLoopForUI message_loop_;
   Widget* window_;
 
   DISALLOW_COPY_AND_ASSIGN(TabbedPaneTest);
 };
 
-#if defined(OS_WIN)
-// These test are failing and crash on Win7. See http://crbug.com/104067
-#define MAYBE_SizeAndLayout DISABLED_SizeAndLayout
-#define MAYBE_AddRemove DISABLED_AddRemove
-#else
-#define MAYBE_SizeAndLayout SizeAndLayout
-#define MAYBE_AddRemove AddRemove
-#endif
-
 // Tests that TabbedPane::GetPreferredSize() and TabbedPane::Layout().
-TEST_F(TabbedPaneTest, MAYBE_SizeAndLayout) {
+TEST_F(TabbedPaneTest, SizeAndLayout) {
   View* child1 = new FixedSizeView(gfx::Size(20, 10));
   tabbed_pane_->AddTab(ASCIIToUTF16("tab1"), child1);
   View* child2 = new FixedSizeView(gfx::Size(5, 5));
   tabbed_pane_->AddTab(ASCIIToUTF16("tab2"), child2);
   tabbed_pane_->SelectTabAt(0);
 
   // Check that the preferred size is larger than the largest child.
   gfx::Size pref(tabbed_pane_->GetPreferredSize());
   EXPECT_GT(pref.width(), 20);
   EXPECT_GT(pref.height(), 10);
 
   // The bounds of our children should be smaller than the tabbed pane's bounds.
   tabbed_pane_->SetBounds(0, 0, 100, 200);
-  RunAllPending();
+  RunPendingMessages();
   gfx::Rect bounds(child1->bounds());
   EXPECT_GT(bounds.width(), 0);
   EXPECT_LT(bounds.width(), 100);
   EXPECT_GT(bounds.height(), 0);
   EXPECT_LT(bounds.height(), 200);
 
   // If we switch to the other tab, it should get assigned the same bounds.
   tabbed_pane_->SelectTabAt(1);
   EXPECT_EQ(bounds, child2->bounds());
 }
 
-TEST_F(TabbedPaneTest, MAYBE_AddRemove) {
+TEST_F(TabbedPaneTest, AddRemove) {
   View* tab0 = new View;
   tabbed_pane_->AddTab(ASCIIToUTF16("tab0"), tab0);
   EXPECT_EQ(tab0, tabbed_pane_->GetSelectedTab());
   EXPECT_EQ(0, tabbed_pane_->GetSelectedTabIndex());
 
   // Add more 3 tabs.
   tabbed_pane_->AddTab(ASCIIToUTF16("tab1"), new View);
   tabbed_pane_->AddTab(ASCIIToUTF16("tab2"), new View);
   tabbed_pane_->AddTab(ASCIIToUTF16("tab3"), new View);
   EXPECT_EQ(4, tabbed_pane_->GetTabCount());
@@ skipping 22 matching lines @@
   // Now change the selected tab.
   tabbed_pane_->SelectTabAt(1);
   EXPECT_EQ(1, tabbed_pane_->GetSelectedTabIndex());
 
   // Remove the first one.
   delete tabbed_pane_->RemoveTabAtIndex(0);
   EXPECT_EQ(0, tabbed_pane_->GetSelectedTabIndex());
 }
 
 } // namespace views