diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:35:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:35:56 +0000 |
| commit | f5fa20e471b2fc9bb18f6f673146704483d0b18e (patch) | |
| tree | 0fc2253432ce98c202ae00afdea927f5bda22730 /chrome/browser/tabs/tab_strip_model_unittest.cc | |
| parent | ec55bd7353cbae29541cc348869319104e7349f4 (diff) | |
| download | chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.zip chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.tar.gz chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.tar.bz2 | |
Revert 115346. The change didn't break anything, the test was faulty. Will disable in a followup. - Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests
on win,linux,mac.
Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
TBR=jam
Review URL: http://codereview.chromium.org/9018016
TBR=thakis@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model_unittest.cc')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 71f464b..b592a34 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -584,9 +584,9 @@ TEST_F(TabStripModelTest, TestBasicAPI) { EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(contents2)); EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1)); EXPECT_EQ(0, tabstrip.GetIndexOfController( - &contents2->tab_contents()->controller())); + &contents2->tab_contents()->GetController())); EXPECT_EQ(1, tabstrip.GetIndexOfController( - &contents1->tab_contents()->controller())); + &contents1->tab_contents()->GetController())); } // Test UpdateTabContentsStateAt @@ -639,7 +639,8 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) { // background with opener_contents set as their opener. TabContentsWrapper* opener_contents = CreateTabContents(); - NavigationController* opener = &opener_contents->tab_contents()->controller(); + NavigationController* opener = + &opener_contents->tab_contents()->GetController(); tabstrip.AppendTabContents(opener_contents, true); TabContentsWrapper* contents1 = CreateTabContents(); TabContentsWrapper* contents2 = CreateTabContents(); @@ -677,7 +678,7 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) { // For a tab that has opened no other tabs, the return value should always be // -1... - NavigationController* o1 = &contents1->tab_contents()->controller(); + NavigationController* o1 = &contents1->tab_contents()->GetController(); EXPECT_EQ(-1, tabstrip.GetIndexOfNextTabContentsOpenedBy(o1, 3, false)); EXPECT_EQ(-1, tabstrip.GetIndexOfLastTabContentsOpenedBy(o1, 3)); @@ -790,7 +791,8 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) { EXPECT_TRUE(tabstrip.empty()); TabContentsWrapper* opener_contents = CreateTabContents(); - NavigationController* opener = &opener_contents->tab_contents()->controller(); + NavigationController* opener = + &opener_contents->tab_contents()->GetController(); tabstrip.AppendTabContents(opener_contents, true); // Open some other random unrelated tab in the background to monkey with our |