chrome/browser/tabs/tab_strip_model_unittest.cc - Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/tabs/tab_strip_model_unittest.cc

Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/tabs/tab_strip_model_order_controller.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tabs/tab_strip_model_unittest.cc

diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc

index 93d1ac3e1272f4f34e424475b54019a2d57323ea..447d349f054a91d3328df42cb1ca23f18769cf6c 100644

--- a/chrome/browser/tabs/tab_strip_model_unittest.cc

+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc

@@ -583,8 +583,10 @@ TEST_F(TabStripModelTest, TestBasicAPI) {

EXPECT_EQ(contents1, tabstrip.GetTabContentsAt(1));

EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(contents2));

EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1));

- EXPECT_EQ(0, tabstrip.GetIndexOfController(&contents2->controller()));

- EXPECT_EQ(1, tabstrip.GetIndexOfController(&contents1->controller()));

+ EXPECT_EQ(0, tabstrip.GetIndexOfController(

+ &contents2->tab_contents()->controller()));

+ EXPECT_EQ(1, tabstrip.GetIndexOfController(

+ &contents1->tab_contents()->controller()));

}

// Test UpdateTabContentsStateAt

@@ -637,7 +639,7 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) {

// background with opener_contents set as their opener.

TabContentsWrapper* opener_contents = CreateTabContents();

- NavigationController* opener = &opener_contents->controller();

+ NavigationController* opener = &opener_contents->tab_contents()->controller();

tabstrip.AppendTabContents(opener_contents, true);

TabContentsWrapper* contents1 = CreateTabContents();

TabContentsWrapper* contents2 = CreateTabContents();

@@ -675,7 +677,7 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) {

// For a tab that has opened no other tabs, the return value should always be

// -1...

- NavigationController* o1 = &contents1->controller();

+ NavigationController* o1 = &contents1->tab_contents()->controller();

EXPECT_EQ(-1, tabstrip.GetIndexOfNextTabContentsOpenedBy(o1, 3, false));

EXPECT_EQ(-1, tabstrip.GetIndexOfLastTabContentsOpenedBy(o1, 3));

@@ -788,7 +790,7 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) {

EXPECT_TRUE(tabstrip.empty());

TabContentsWrapper* opener_contents = CreateTabContents();

- NavigationController* opener = &opener_contents->controller();

+ NavigationController* opener = &opener_contents->tab_contents()->controller();

tabstrip.AppendTabContents(opener_contents, true);

// Open some other random unrelated tab in the background to monkey with our