TabbedPane: refactor away manual layout and selected_tab_index_

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 "ui/views/controls/tabbed_pane/tabbed_pane.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 56 matching lines @@
   EXPECT_EQ(bounds, child2->bounds());
 }
 
 TEST_F(TabbedPaneTest, AddAndSelect) {
   std::unique_ptr<TabbedPane> tabbed_pane(new TabbedPane());
   // Add several tabs; only the first should be a selected automatically.
   for (int i = 0; i < 3; ++i) {
     View* tab = new View();
     tabbed_pane->AddTab(ASCIIToUTF16("tab"), tab);
     EXPECT_EQ(i + 1, tabbed_pane->GetTabCount());
-    EXPECT_EQ(0, tabbed_pane->selected_tab_index());
+    EXPECT_EQ(0, tabbed_pane->GetSelectedTabIndex());
   }
 
   // Select each tab.
   for (int i = 0; i < tabbed_pane->GetTabCount(); ++i) {
     tabbed_pane->SelectTabAt(i);
-    EXPECT_EQ(i, tabbed_pane->selected_tab_index());
+    EXPECT_EQ(i, tabbed_pane->GetSelectedTabIndex());
   }
 
   // Add a tab at index 0, it should not be selected automatically.
   View* tab0 = new View();
   tabbed_pane->AddTabAtIndex(0, ASCIIToUTF16("tab0"), tab0);
   EXPECT_NE(tab0, tabbed_pane->GetSelectedTabContentView());
-  EXPECT_NE(0, tabbed_pane->selected_tab_index());
+  EXPECT_NE(0, tabbed_pane->GetSelectedTabIndex());
 }
 
 ui::KeyEvent MakeKeyPressedEvent(ui::KeyboardCode keyboard_code, int flags) {
   return ui::KeyEvent(ui::ET_KEY_PRESSED, keyboard_code,
                       ui::UsLayoutKeyboardCodeToDomCode(keyboard_code), flags);
 }
 
 TEST_F(TabbedPaneTest, ArrowKeyBindings) {
   std::unique_ptr<TabbedPane> tabbed_pane(new TabbedPane());
   // Add several tabs; only the first should be a selected automatically.
   for (int i = 0; i < 3; ++i) {
     View* tab = new View();
     tabbed_pane->AddTab(ASCIIToUTF16("tab"), tab);
     EXPECT_EQ(i + 1, tabbed_pane->GetTabCount());
   }
 
-  EXPECT_EQ(0, tabbed_pane->selected_tab_index());
+  EXPECT_EQ(0, tabbed_pane->GetSelectedTabIndex());
 
   // Right arrow should select tab 1:
   tabbed_pane->GetSelectedTab()->OnKeyPressed(
       MakeKeyPressedEvent(ui::VKEY_RIGHT, 0));
-  EXPECT_EQ(1, tabbed_pane->selected_tab_index());
+  EXPECT_EQ(1, tabbed_pane->GetSelectedTabIndex());
 
   // Left arrow should select tab 0:
   tabbed_pane->GetSelectedTab()->OnKeyPressed(
       MakeKeyPressedEvent(ui::VKEY_LEFT, 0));
-  EXPECT_EQ(0, tabbed_pane->selected_tab_index());
+  EXPECT_EQ(0, tabbed_pane->GetSelectedTabIndex());
 
   // Left arrow again should wrap to tab 2:
   tabbed_pane->GetSelectedTab()->OnKeyPressed(
       MakeKeyPressedEvent(ui::VKEY_LEFT, 0));
-  EXPECT_EQ(2, tabbed_pane->selected_tab_index());
+  EXPECT_EQ(2, tabbed_pane->GetSelectedTabIndex());
 
   // Right arrow again should wrap to tab 0:
   tabbed_pane->GetSelectedTab()->OnKeyPressed(
       MakeKeyPressedEvent(ui::VKEY_RIGHT, 0));
-  EXPECT_EQ(0, tabbed_pane->selected_tab_index());
+  EXPECT_EQ(0, tabbed_pane->GetSelectedTabIndex());
 }
 
 }  // namespace views