| Index: chrome/browser/ui/views/tabs/tab_strip_unittest.cc
|
| diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
|
| index afdd9dcad94e186c0d2807de7639c050f6b21c10..aa00184f219ba93d3a92ff4bc6a1def69df9fad6 100644
|
| --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
|
| +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
|
| @@ -178,13 +178,13 @@ TEST_F(TabStripTest, IsValidModelIndex) {
|
| }
|
|
|
| TEST_F(TabStripTest, tab_count) {
|
| - EXPECT_EQ(0, tab_strip_->tab_count());
|
| + EXPECT_EQ(0, tab_strip_->GetTabCount());
|
| }
|
|
|
| TEST_F(TabStripTest, AddTabAt) {
|
| TestTabStripObserver observer(tab_strip_);
|
| tab_strip_->AddTabAt(0, TabRendererData(), false);
|
| - ASSERT_EQ(1, tab_strip_->tab_count());
|
| + ASSERT_EQ(1, tab_strip_->GetTabCount());
|
| EXPECT_EQ(0, observer.last_tab_added());
|
| Tab* tab = tab_strip_->tab_at(0);
|
| EXPECT_FALSE(tab == NULL);
|
| @@ -205,7 +205,7 @@ TEST_F(TabStripTest, MoveTab) {
|
| tab_strip_->AddTabAt(0, TabRendererData(), false);
|
| tab_strip_->AddTabAt(1, TabRendererData(), false);
|
| tab_strip_->AddTabAt(2, TabRendererData(), false);
|
| - ASSERT_EQ(3, tab_strip_->tab_count());
|
| + ASSERT_EQ(3, tab_strip_->GetTabCount());
|
| EXPECT_EQ(2, observer.last_tab_added());
|
| Tab* tab = tab_strip_->tab_at(0);
|
| tab_strip_->MoveTab(0, 1, TabRendererData());
|
| @@ -220,11 +220,11 @@ TEST_F(TabStripTest, RemoveTab) {
|
| controller_->AddTab(0, false);
|
| controller_->AddTab(1, false);
|
| const int child_view_count = tab_strip_->child_count();
|
| - EXPECT_EQ(2, tab_strip_->tab_count());
|
| + EXPECT_EQ(2, tab_strip_->GetTabCount());
|
| controller_->RemoveTab(0);
|
| EXPECT_EQ(0, observer.last_tab_removed());
|
| // When removing a tab the tabcount should immediately decrement.
|
| - EXPECT_EQ(1, tab_strip_->tab_count());
|
| + EXPECT_EQ(1, tab_strip_->GetTabCount());
|
| // But the number of views should remain the same (it's animatining closed).
|
| EXPECT_EQ(child_view_count, tab_strip_->child_count());
|
| tab_strip_->SetBounds(0, 0, 200, 20);
|
| @@ -277,12 +277,12 @@ TEST_F(TabStripTest, VisibilityInOverflow) {
|
| ASSERT_GT(i, 0);
|
| EXPECT_LT(i, invisible_tab_index);
|
| invisible_tab_index = i;
|
| - for (int i = invisible_tab_index + 1; i < tab_strip_->tab_count(); ++i)
|
| + for (int i = invisible_tab_index + 1; i < tab_strip_->GetTabCount(); ++i)
|
| EXPECT_FALSE(tab_strip_->tab_at(i)->visible());
|
|
|
| // When we're already in overflow, adding tabs at the beginning or end of
|
| // the strip should not change how many tabs are visible.
|
| - controller_->AddTab(tab_strip_->tab_count(), false);
|
| + controller_->AddTab(tab_strip_->GetTabCount(), false);
|
| EXPECT_TRUE(tab_strip_->tab_at(invisible_tab_index - 1)->visible());
|
| EXPECT_FALSE(tab_strip_->tab_at(invisible_tab_index)->visible());
|
| controller_->AddTab(0, false);
|
| @@ -290,9 +290,9 @@ TEST_F(TabStripTest, VisibilityInOverflow) {
|
| EXPECT_FALSE(tab_strip_->tab_at(invisible_tab_index)->visible());
|
|
|
| // If we remove enough tabs, all the tabs should be visible.
|
| - for (int i = tab_strip_->tab_count() - 1; i >= invisible_tab_index; --i)
|
| + for (int i = tab_strip_->GetTabCount() - 1; i >= invisible_tab_index; --i)
|
| controller_->RemoveTab(i);
|
| - EXPECT_TRUE(tab_strip_->tab_at(tab_strip_->tab_count() - 1)->visible());
|
| + EXPECT_TRUE(tab_strip_->tab_at(tab_strip_->GetTabCount() - 1)->visible());
|
| }
|
|
|
| TEST_F(TabStripTest, ImmersiveMode) {
|
| @@ -325,7 +325,7 @@ TEST_F(TabStripTest, TabHitTestMaskWhenStacked) {
|
| controller_->AddTab(1, true);
|
| controller_->AddTab(2, false);
|
| controller_->AddTab(3, false);
|
| - ASSERT_EQ(4, tab_strip_->tab_count());
|
| + ASSERT_EQ(4, tab_strip_->GetTabCount());
|
|
|
| Tab* left_tab = tab_strip_->tab_at(0);
|
| left_tab->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), gfx::Size(200, 20)));
|
| @@ -458,7 +458,7 @@ TEST_F(TabStripTest, ClippedTabCloseButton) {
|
|
|
| controller_->AddTab(0, false);
|
| controller_->AddTab(1, true);
|
| - ASSERT_EQ(2, tab_strip_->tab_count());
|
| + ASSERT_EQ(2, tab_strip_->GetTabCount());
|
|
|
| Tab* left_tab = tab_strip_->tab_at(0);
|
| left_tab->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), gfx::Size(200, 20)));
|
| @@ -515,7 +515,7 @@ TEST_F(TabStripTest, GetEventHandlerForOverlappingArea) {
|
| controller_->AddTab(1, true);
|
| controller_->AddTab(2, false);
|
| controller_->AddTab(3, false);
|
| - ASSERT_EQ(4, tab_strip_->tab_count());
|
| + ASSERT_EQ(4, tab_strip_->GetTabCount());
|
|
|
| // Verify that the active tab will be a tooltip handler for points that hit
|
| // it.
|
| @@ -578,7 +578,7 @@ TEST_F(TabStripTest, GetTooltipHandler) {
|
| controller_->AddTab(1, true);
|
| controller_->AddTab(2, false);
|
| controller_->AddTab(3, false);
|
| - ASSERT_EQ(4, tab_strip_->tab_count());
|
| + ASSERT_EQ(4, tab_strip_->GetTabCount());
|
|
|
| // Verify that the active tab will be a tooltip handler for points that hit
|
| // it.
|
|
|