Change the GetSelectedTab method of the NativeTabbedPaneView to return the tab contents.

ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc

 // Copyright (c) 2012 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/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
@@ skipping 22 matching lines @@
                        public WidgetDelegate {
  public:
   TabbedPaneTest() {}
 
   TabbedPane* tabbed_pane_;
 
  private:
   virtual void SetUp() OVERRIDE {
     ViewsTestBase::SetUp();
     tabbed_pane_ = new TabbedPane();
-    tabbed_pane_->set_use_native_win_control(true);
     window_ = Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 100, 100));
     window_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
     window_->Close();
     ViewsTestBase::TearDown();
   }
 
   virtual views::View* GetContentsView() OVERRIDE {
@@ skipping 14 matching lines @@
 // Tests that TabbedPane::GetPreferredSize() and TabbedPane::Layout().
 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);
+  // The |tabbed_pane_| has no border. Therefor it should be as wide as the

[msw, 2012/07/25 20:19:27]

nit: "therefore" here and at 87

[markusheintz_, 2012/07/26 18:21:35]

Done.

+  // widest tab.
+  EXPECT_EQ(pref.width(), 20);

[msw, 2012/07/25 20:19:27]

EXPECT_GE would cover both impls then, right?

[markusheintz_, 2012/07/26 18:21:35]

Correct. Done.

   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);
   RunPendingMessages();
   gfx::Rect bounds(child1->bounds());
   EXPECT_GT(bounds.width(), 0);
-  EXPECT_LT(bounds.width(), 100);
+  // The |tabbed_pane_| has no border. Therefor the children should be as wide
+  // as the |tabbed_pane_|.
+  EXPECT_EQ(bounds.width(), 100);

[msw, 2012/07/25 20:19:27]

EXPECT_LE would cover both impls then, right?

[markusheintz_, 2012/07/26 18:21:35]

Correct. Done.

   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, AddRemove) {
   View* tab0 = new View;
@@ skipping 31 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