| Index: chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| index 445f2be1651c98e39429c5bbe413268c234b3756..b344bd4ab841f7838dff83b2bd66b3f38d3e2e18 100644
|
| --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
|
| @@ -757,7 +757,7 @@ TEST_F(TabStripModelTest, TestBasicOpenerAPI) {
|
|
|
| static int GetInsertionIndex(TabStripModel* tabstrip) {
|
| return tabstrip->order_controller()->DetermineInsertionIndex(
|
| - content::PAGE_TRANSITION_LINK, false);
|
| + ui::PAGE_TRANSITION_LINK, false);
|
| }
|
|
|
| static void InsertWebContentses(TabStripModel* tabstrip,
|
| @@ -838,7 +838,7 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) {
|
| // opener tab.
|
| WebContents* fg_link_contents = CreateWebContents();
|
| int insert_index = tabstrip.order_controller()->DetermineInsertionIndex(
|
| - content::PAGE_TRANSITION_LINK, true);
|
| + ui::PAGE_TRANSITION_LINK, true);
|
| EXPECT_EQ(1, insert_index);
|
| tabstrip.InsertWebContentsAt(insert_index, fg_link_contents,
|
| TabStripModel::ADD_ACTIVE |
|
| @@ -853,7 +853,7 @@ TEST_F(TabStripModelTest, TestInsertionIndexDetermination) {
|
| // Now open a new empty tab. It should open at the end of the strip.
|
| WebContents* fg_nonlink_contents = CreateWebContents();
|
| insert_index = tabstrip.order_controller()->DetermineInsertionIndex(
|
| - content::PAGE_TRANSITION_AUTO_BOOKMARK, true);
|
| + ui::PAGE_TRANSITION_AUTO_BOOKMARK, true);
|
| EXPECT_EQ(tabstrip.count(), insert_index);
|
| // We break the opener relationship...
|
| tabstrip.InsertWebContentsAt(insert_index,
|
| @@ -1233,13 +1233,13 @@ TEST_F(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) {
|
| // Open the Home Page.
|
| WebContents* homepage_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open some other tab, by user typing.
|
| WebContents* typed_page_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(2, tabstrip.count());
|
| @@ -1251,15 +1251,15 @@ TEST_F(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) {
|
| // page.
|
| WebContents* middle_click_contents1 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents1, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents1, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| WebContents* middle_click_contents2 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents2, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents2, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| WebContents* middle_click_contents3 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents3, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents3, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| EXPECT_EQ(5, tabstrip.count());
|
| @@ -1303,13 +1303,13 @@ TEST_F(TabStripModelTest, AddWebContents_LeftClickPopup) {
|
| // Open the Home Page.
|
| WebContents* homepage_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open some other tab, by user typing.
|
| WebContents* typed_page_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(2, tabstrip.count());
|
| @@ -1320,7 +1320,7 @@ TEST_F(TabStripModelTest, AddWebContents_LeftClickPopup) {
|
| // Open a tab by simulating a left click on a link that opens in a new tab.
|
| WebContents* left_click_contents = CreateWebContents();
|
| tabstrip.AddWebContents(left_click_contents, -1,
|
| - content::PAGE_TRANSITION_LINK,
|
| + ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Verify the state meets our expectations.
|
| @@ -1354,13 +1354,13 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
|
| // Open the Home Page.
|
| WebContents* homepage_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open some other tab, by user typing.
|
| WebContents* typed_page_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(2, tabstrip.count());
|
| @@ -1371,7 +1371,7 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
|
| // Open a new blank tab in the foreground.
|
| WebContents* new_blank_contents = CreateWebContents();
|
| tabstrip.AddWebContents(new_blank_contents, -1,
|
| - content::PAGE_TRANSITION_TYPED,
|
| + ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Verify the state of the tabstrip.
|
| @@ -1383,11 +1383,11 @@ TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
|
| // Now open a couple more blank tabs in the background.
|
| WebContents* background_blank_contents1 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - background_blank_contents1, -1, content::PAGE_TRANSITION_TYPED,
|
| + background_blank_contents1, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_NONE);
|
| WebContents* background_blank_contents2 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - background_blank_contents2, -1, content::PAGE_TRANSITION_GENERATED,
|
| + background_blank_contents2, -1, ui::PAGE_TRANSITION_GENERATED,
|
| TabStripModel::ADD_NONE);
|
| EXPECT_EQ(5, tabstrip.count());
|
| EXPECT_EQ(homepage_contents, tabstrip.GetWebContentsAt(0));
|
| @@ -1410,13 +1410,13 @@ TEST_F(TabStripModelTest, AddWebContents_ForgetOpeners) {
|
| // Open the Home Page
|
| WebContents* homepage_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open some other tab, by user typing.
|
| WebContents* typed_page_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(2, tabstrip.count());
|
| @@ -1428,15 +1428,15 @@ TEST_F(TabStripModelTest, AddWebContents_ForgetOpeners) {
|
| // page.
|
| WebContents* middle_click_contents1 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents1, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents1, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| WebContents* middle_click_contents2 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents2, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents2, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| WebContents* middle_click_contents3 = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - middle_click_contents3, -1, content::PAGE_TRANSITION_LINK,
|
| + middle_click_contents3, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Break out of the context by selecting a tab in a different context.
|
| @@ -1475,13 +1475,13 @@ TEST_F(TabStripModelTest, AppendContentsReselectionTest) {
|
| // Open the Home Page.
|
| WebContents* homepage_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + homepage_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open some other tab, by user typing.
|
| WebContents* typed_page_contents = CreateWebContents();
|
| tabstrip.AddWebContents(
|
| - typed_page_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + typed_page_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_NONE);
|
|
|
| // The selected tab should still be the first.
|
| @@ -1507,15 +1507,15 @@ TEST_F(TabStripModelTest, ReselectionConsidersChildrenTest) {
|
| // Open page A
|
| WebContents* page_a_contents = CreateWebContents();
|
| strip.AddWebContents(
|
| - page_a_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + page_a_contents, -1, ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Simulate middle click to open page A.A and A.B
|
| WebContents* page_a_a_contents = CreateWebContents();
|
| - strip.AddWebContents(page_a_a_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_a_a_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| WebContents* page_a_b_contents = CreateWebContents();
|
| - strip.AddWebContents(page_a_b_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_a_b_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Select page A.A
|
| @@ -1524,7 +1524,7 @@ TEST_F(TabStripModelTest, ReselectionConsidersChildrenTest) {
|
|
|
| // Simulate a middle click to open page A.A.A
|
| WebContents* page_a_a_a_contents = CreateWebContents();
|
| - strip.AddWebContents(page_a_a_a_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_a_a_a_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| EXPECT_EQ(page_a_a_a_contents, strip.GetWebContentsAt(2));
|
| @@ -1558,18 +1558,18 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) {
|
| // Open page A
|
| WebContents* page_a_contents = CreateWebContents();
|
| strip.AddWebContents(page_a_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open pages B, C and D in the background from links on page A...
|
| WebContents* page_b_contents = CreateWebContents();
|
| WebContents* page_c_contents = CreateWebContents();
|
| WebContents* page_d_contents = CreateWebContents();
|
| - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Switch to page B's tab.
|
| @@ -1577,7 +1577,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) {
|
|
|
| // Open a New Tab at the end of the strip (simulate Ctrl+T)
|
| WebContents* new_contents = CreateWebContents();
|
| - strip.AddWebContents(new_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(new_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(4, strip.GetIndexOfWebContents(new_contents));
|
| @@ -1593,7 +1593,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) {
|
| // This is like typing a URL in the address bar and pressing Alt+Enter. The
|
| // behavior should be the same as above.
|
| WebContents* page_e_contents = CreateWebContents();
|
| - strip.AddWebContents(page_e_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(page_e_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(4, strip.GetIndexOfWebContents(page_e_contents));
|
| @@ -1610,7 +1610,7 @@ TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsGroup) {
|
| // and the one that was active when the gesture was performed.
|
| WebContents* page_f_contents = CreateWebContents();
|
| strip.AddWebContents(page_f_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| + ui::PAGE_TRANSITION_AUTO_BOOKMARK,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| EXPECT_EQ(4, strip.GetIndexOfWebContents(page_f_contents));
|
| @@ -1636,36 +1636,36 @@ TEST_F(TabStripModelTest, NavigationForgetsOpeners) {
|
| // Open page A
|
| WebContents* page_a_contents = CreateWebContents();
|
| strip.AddWebContents(page_a_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Open pages B, C and D in the background from links on page A...
|
| WebContents* page_b_contents = CreateWebContents();
|
| WebContents* page_c_contents = CreateWebContents();
|
| WebContents* page_d_contents = CreateWebContents();
|
| - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Open page E in a different opener group from page A.
|
| WebContents* page_e_contents = CreateWebContents();
|
| strip.AddWebContents(page_e_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Tell the TabStripModel that we are navigating page D via a link click.
|
| strip.ActivateTabAt(3, true);
|
| - strip.TabNavigating(page_d_contents, content::PAGE_TRANSITION_LINK);
|
| + strip.TabNavigating(page_d_contents, ui::PAGE_TRANSITION_LINK);
|
|
|
| // Close page D, page C should be selected. (part of same group).
|
| strip.CloseWebContentsAt(3, TabStripModel::CLOSE_NONE);
|
| EXPECT_EQ(2, strip.active_index());
|
|
|
| // Tell the TabStripModel that we are navigating in page C via a bookmark.
|
| - strip.TabNavigating(page_c_contents, content::PAGE_TRANSITION_AUTO_BOOKMARK);
|
| + strip.TabNavigating(page_c_contents, ui::PAGE_TRANSITION_AUTO_BOOKMARK);
|
|
|
| // Close page C, page E should be selected. (C is no longer part of the
|
| // A-B-C-D group, selection moves to the right).
|
| @@ -1687,17 +1687,17 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
|
| // opened.
|
| WebContents* page_a_contents = CreateWebContents();
|
| strip.AddWebContents(page_a_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| WebContents* page_b_contents = CreateWebContents();
|
| WebContents* page_c_contents = CreateWebContents();
|
| WebContents* page_d_contents = CreateWebContents();
|
| - strip.AddWebContents(page_b_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_b_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_c_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| - strip.AddWebContents(page_d_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| strip.ActivateTabAt(2, true);
|
| @@ -1708,7 +1708,7 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
|
|
|
| // Now simulate opening a new tab at the end of the TabStrip.
|
| WebContents* new_contents1 = CreateWebContents();
|
| - strip.AddWebContents(new_contents1, -1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(new_contents1, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // At this point, if we close this tab the last selected one should be
|
| @@ -1722,7 +1722,7 @@ TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
|
|
|
| // Open a new tab again.
|
| WebContents* new_contents2 = CreateWebContents();
|
| - strip.AddWebContents(new_contents2, -1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(new_contents2, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| // Now select the first tab.
|
| @@ -2113,7 +2113,7 @@ TEST_F(TabStripModelTest, ReplaceSendsSelected) {
|
| TabStripModel strip(&delegate, profile());
|
|
|
| WebContents* first_contents = CreateWebContents();
|
| - strip.AddWebContents(first_contents, -1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(first_contents, -1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_ACTIVE);
|
|
|
| MockTabStripModelObserver tabstrip_observer(&strip);
|
| @@ -2138,7 +2138,7 @@ TEST_F(TabStripModelTest, ReplaceSendsSelected) {
|
| // Now add another tab and replace it, making sure we don't get a selected
|
| // event this time.
|
| WebContents* third_contents = CreateWebContents();
|
| - strip.AddWebContents(third_contents, 1, content::PAGE_TRANSITION_TYPED,
|
| + strip.AddWebContents(third_contents, 1, ui::PAGE_TRANSITION_TYPED,
|
| TabStripModel::ADD_NONE);
|
|
|
| tabstrip_observer.ClearStates();
|
| @@ -2331,19 +2331,19 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) {
|
| // Open page A as a new tab and then A1 in the background from A.
|
| WebContents* page_a_contents = CreateWebContents();
|
| strip.AddWebContents(page_a_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_ACTIVE);
|
| WebContents* page_a1_contents = CreateWebContents();
|
| - strip.AddWebContents(page_a1_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_a1_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| // Likewise, open pages B and B1.
|
| WebContents* page_b_contents = CreateWebContents();
|
| strip.AddWebContents(page_b_contents, -1,
|
| - content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| + ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
| TabStripModel::ADD_ACTIVE);
|
| WebContents* page_b1_contents = CreateWebContents();
|
| - strip.AddWebContents(page_b1_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_b1_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
|
|
| EXPECT_EQ(page_a_contents, strip.GetWebContentsAt(0));
|
| @@ -2356,7 +2356,7 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) {
|
|
|
| // Open page B2 in the background from B. It should end up after B.
|
| WebContents* page_b2_contents = CreateWebContents();
|
| - strip.AddWebContents(page_b2_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_b2_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| EXPECT_EQ(page_b_contents, strip.GetWebContentsAt(0));
|
| EXPECT_EQ(page_b2_contents, strip.GetWebContentsAt(1));
|
| @@ -2370,7 +2370,7 @@ TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetGroups) {
|
|
|
| // Open page A2 in the background from A. It should end up after A1.
|
| WebContents* page_a2_contents = CreateWebContents();
|
| - strip.AddWebContents(page_a2_contents, -1, content::PAGE_TRANSITION_LINK,
|
| + strip.AddWebContents(page_a2_contents, -1, ui::PAGE_TRANSITION_LINK,
|
| TabStripModel::ADD_NONE);
|
| EXPECT_EQ(page_b_contents, strip.GetWebContentsAt(0));
|
| EXPECT_EQ(page_b2_contents, strip.GetWebContentsAt(1));
|
|
|