Remove NativeTabbedPane[Win|Wrapper]; promote Views impl.

ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc

Index: ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index 1649402f16e52ab8f3d3a0b90a005a3476af02bf..da0e554c44b8516fc54fc4b163962438dd2d546f 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -34,16 +34,8 @@ class TabbedPaneTest : public ViewsTestBase {
  public:
   TabbedPaneTest() {}
 
-  void TestSizeAndLayout(TabbedPane* tabbed_pane);
-
-  void TestAddRemove(TabbedPane* tabbed_pane);
-
   TabbedPane* tabbed_pane_;  // Owned by the |widget_|'s root View.
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  TabbedPane* tabbed_pane_win_;  // Owned by the |widget_|'s root View.
-#endif
-
  private:
   virtual void SetUp() OVERRIDE;
 
@@ -63,31 +55,26 @@ void TabbedPaneTest::SetUp() {
   // In order to properly initialize the |TabbedPane| it must be added to a
   // parent view (see the ViewHierarchyChanged method of the |TabbedPane|).
   widget_->GetRootView()->AddChildView(tabbed_pane_);
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-  tabbed_pane_win_ = new TabbedPane();
-  tabbed_pane_win_->set_use_native_win_control(true);
-  widget_->GetRootView()->AddChildView(tabbed_pane_win_);
-#endif
 }
 
-void TabbedPaneTest::TestSizeAndLayout(TabbedPane* tabbed_pane) {
+// Tests TabbedPane::GetPreferredSize() and TabbedPane::Layout().
+TEST_F(TabbedPaneTest, SizeAndLayout) {
   View* child1 = new FixedSizeView(gfx::Size(20, 10));
-  tabbed_pane->AddTab(ASCIIToUTF16("tab1"), child1);
+  tabbed_pane_->AddTab(ASCIIToUTF16("tab1"), child1);
   View* child2 = new FixedSizeView(gfx::Size(5, 5));
-  tabbed_pane->AddTab(ASCIIToUTF16("tab2"), child2);
-  tabbed_pane->SelectTabAt(0);
+  tabbed_pane_->AddTab(ASCIIToUTF16("tab2"), child2);
+  tabbed_pane_->SelectTabAt(0);
 
   // The |tabbed_pane_| implementation of Views has no border by default.
   // Therefore it should be as wide as the widest tab. The native Windows
   // tabbed pane has a border that used up extra space. Therefore the preferred
   // width is larger than the largest child.
-  gfx::Size pref(tabbed_pane->GetPreferredSize());
+  gfx::Size pref(tabbed_pane_->GetPreferredSize());
   EXPECT_GE(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);
+  tabbed_pane_->SetBounds(0, 0, 100, 200);
   RunPendingMessages();
   gfx::Rect bounds(child1->bounds());
   EXPECT_GT(bounds.width(), 0);
@@ -98,86 +85,63 @@ void TabbedPaneTest::TestSizeAndLayout(TabbedPane* tabbed_pane) {
   EXPECT_LT(bounds.height(), 200);
 
   // If we switch to the other tab, it should get assigned the same bounds.
-  tabbed_pane->SelectTabAt(1);
+  tabbed_pane_->SelectTabAt(1);
   EXPECT_EQ(bounds, child2->bounds());
 
   // Clean up.
-  delete tabbed_pane->RemoveTabAtIndex(0);
-  EXPECT_EQ(1, tabbed_pane->GetTabCount());
-  delete tabbed_pane->RemoveTabAtIndex(0);
-  EXPECT_EQ(0, tabbed_pane->GetTabCount());
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  EXPECT_EQ(1, tabbed_pane_->GetTabCount());
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  EXPECT_EQ(0, tabbed_pane_->GetTabCount());
 }
 
-void TabbedPaneTest::TestAddRemove(TabbedPane* tabbed_pane) {
+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());
+  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());
+  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());
 
   // Note: AddTab() doesn't select a tab if the tabbed pane isn't empty.
 
   // Select the last one.
-  tabbed_pane->SelectTabAt(tabbed_pane->GetTabCount() - 1);
-  EXPECT_EQ(3, tabbed_pane->GetSelectedTabIndex());
+  tabbed_pane_->SelectTabAt(tabbed_pane_->GetTabCount() - 1);
+  EXPECT_EQ(3, tabbed_pane_->GetSelectedTabIndex());
 
   // Remove the last one.
-  delete tabbed_pane->RemoveTabAtIndex(3);
-  EXPECT_EQ(3, tabbed_pane->GetTabCount());
+  delete tabbed_pane_->RemoveTabAtIndex(3);
+  EXPECT_EQ(3, tabbed_pane_->GetTabCount());
 
   // After removing the last tab, check if the tabbed pane selected the previous
   // tab.
-  EXPECT_EQ(2, tabbed_pane->GetSelectedTabIndex());
+  EXPECT_EQ(2, tabbed_pane_->GetSelectedTabIndex());
 
-  tabbed_pane->AddTabAtIndex(0, ASCIIToUTF16("tab4"), new View, true);
+  tabbed_pane_->AddTabAtIndex(0, ASCIIToUTF16("tab4"), new View, true);
 
   // Assert that even adding a new tab, the tabbed pane doesn't change the
   // selection, i.e., it doesn't select the new one.
   // The last tab should remains selected, instead of the tab added at index 0.
-  EXPECT_EQ(3, tabbed_pane->GetSelectedTabIndex());
+  EXPECT_EQ(3, tabbed_pane_->GetSelectedTabIndex());
 
   // Now change the selected tab.
-  tabbed_pane->SelectTabAt(1);
-  EXPECT_EQ(1, tabbed_pane->GetSelectedTabIndex());
+  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());
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  EXPECT_EQ(0, tabbed_pane_->GetSelectedTabIndex());
 
   // Clean up the other panes.
-  EXPECT_EQ(3, tabbed_pane->GetTabCount());
-  delete tabbed_pane->RemoveTabAtIndex(0);
-  delete tabbed_pane->RemoveTabAtIndex(0);
-  delete tabbed_pane->RemoveTabAtIndex(0);
-  EXPECT_EQ(0, tabbed_pane->GetTabCount());
-}
-
-// Tests TabbedPane::GetPreferredSize() and TabbedPane::Layout().
-TEST_F(TabbedPaneTest, SizeAndLayout) {
-  TestSizeAndLayout(tabbed_pane_);
-  // TODO(markusheintz): Once replacing NativeTabbedPaneWin with
-  // NativeTabbedPaneView is completed (http://crbug.com/138059), then the
-  // TestSizeAndLayout method should be inlined here again and the "ifdef" part
-  // should be deleted.
-#if defined(OS_WIN) && !defined(USE_AURA)
-  TestSizeAndLayout(tabbed_pane_win_);
-#endif
-}
-
-TEST_F(TabbedPaneTest, AddRemove) {
-  TestAddRemove(tabbed_pane_);
-  // TODO(markusheintz): Once replacing NativeTabbedPaneWin with
-  // NativeTabbedPaneView is completed (http://crbug.com/138059), then the
-  // TestAddRemove method should be inlined here again and the "ifdef" part
-  // should be deleted.
-#if defined(OS_WIN) && !defined(USE_AURA)
-  TestAddRemove(tabbed_pane_win_);
-#endif
+  EXPECT_EQ(3, tabbed_pane_->GetTabCount());
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  delete tabbed_pane_->RemoveTabAtIndex(0);
+  EXPECT_EQ(0, tabbed_pane_->GetTabCount());
 }
 
 }  // namespace views