Fix tab insertion position after moving tab or nesting openers

chrome/browser/ui/tabs/tab_strip_model_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 "chrome/browser/ui/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 845 matching lines @@
   // Verify that all opener relationships are forgotten.
   EXPECT_EQ(-1, tabstrip.GetIndexOfNextWebContentsOpenedBy(opener, 2, false));
   EXPECT_EQ(-1, tabstrip.GetIndexOfNextWebContentsOpenedBy(opener, 3, false));
   EXPECT_EQ(-1, tabstrip.GetIndexOfNextWebContentsOpenedBy(opener, 3, false));
   EXPECT_EQ(-1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener, 1));
 
   tabstrip.CloseAllTabs();
   EXPECT_TRUE(tabstrip.empty());
 }
 
+// Tests that non-adjacent tabs with an opener are ignored when deciding where
+// to position tabs.
+TEST_F(TabStripModelTest, TestInsertionIndexDeterminationAfterDragged) {
+  TabStripDummyDelegate delegate;
+  TabStripModel tabstrip(&delegate, profile());
+  EXPECT_TRUE(tabstrip.empty());
+
+  // Start with three tabs, of which the first is active.
+  WebContents* opener1 = CreateWebContentsWithID(1);
+  tabstrip.AppendWebContents(opener1, true /* foreground */);
+  tabstrip.AppendWebContents(CreateWebContentsWithID(2), false);
+  tabstrip.AppendWebContents(CreateWebContentsWithID(3), false);
+  EXPECT_EQ("1 2 3", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  EXPECT_EQ(-1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+
+  // Open a link in a new background tab.
+  tabstrip.InsertWebContentsAt(GetInsertionIndex(&tabstrip),
+                               CreateWebContentsWithID(11),
+                               TabStripModel::ADD_INHERIT_GROUP);
+  EXPECT_EQ("1 11 2 3", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  EXPECT_EQ(1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+
+  // Drag that tab (which activates it) one to the right.
+  tabstrip.MoveWebContentsAt(1, 2, true /* select_after_move */);
+  EXPECT_EQ("1 2 11 3", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(11, GetID(tabstrip.GetActiveWebContents()));
+  // It should no longer be counted by GetIndexOfLastWebContentsOpenedBy,
+  // since there is a tab in between, even though its opener is unchanged.
+  // TODO(johnme): Maybe its opener should be reset when it's dragged away.
+  EXPECT_EQ(-1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+  EXPECT_EQ(opener1, tabstrip.GetOpenerOfWebContentsAt(2));
+
+  // Activate the parent tab again.
+  tabstrip.ActivateTabAt(0, true /* user_gesture */);
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+
+  // Open another link in a new background tab.
+  tabstrip.InsertWebContentsAt(GetInsertionIndex(&tabstrip),
+                               CreateWebContentsWithID(12),
+                               TabStripModel::ADD_INHERIT_GROUP);
+  // Tab 12 should be next to 1, and considered opened by it.
+  EXPECT_EQ("1 12 2 11 3", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  EXPECT_EQ(1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+
+  tabstrip.CloseAllTabs();
+  EXPECT_TRUE(tabstrip.empty());
+}
+
+// Tests that grandchild tabs are considered to be opened by their grandparent
+// tab when deciding where to position tabs.
+TEST_F(TabStripModelTest, TestInsertionIndexDeterminationNestedOpener) {
+  TabStripDummyDelegate delegate;
+  TabStripModel tabstrip(&delegate, profile());
+  EXPECT_TRUE(tabstrip.empty());
+
+  // Start with two tabs, of which the first is active:
+  WebContents* opener1 = CreateWebContentsWithID(1);
+  tabstrip.AppendWebContents(opener1, true /* foreground */);
+  tabstrip.AppendWebContents(CreateWebContentsWithID(2), false);
+  EXPECT_EQ("1 2", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  EXPECT_EQ(-1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+
+  // Open a link in a new background child tab.
+  WebContents* child11 = CreateWebContentsWithID(11);
+  tabstrip.InsertWebContentsAt(GetInsertionIndex(&tabstrip),
+                               child11,
+                               TabStripModel::ADD_INHERIT_GROUP);
+  EXPECT_EQ("1 11 2", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  EXPECT_EQ(1, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+
+  // Activate the child tab:
+  tabstrip.ActivateTabAt(1, true /* user_gesture */);
+  EXPECT_EQ(11, GetID(tabstrip.GetActiveWebContents()));
+
+  // Open a link in a new background grandchild tab.
+  tabstrip.InsertWebContentsAt(GetInsertionIndex(&tabstrip),
+                               CreateWebContentsWithID(111),
+                               TabStripModel::ADD_INHERIT_GROUP);
+  EXPECT_EQ("1 11 111 2", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(11, GetID(tabstrip.GetActiveWebContents()));
+  // The grandchild tab should be counted by GetIndexOfLastWebContentsOpenedBy
+  // as opened by both its parent (child11) and grandparent (opener1).
+  EXPECT_EQ(2, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+  EXPECT_EQ(2, tabstrip.GetIndexOfLastWebContentsOpenedBy(child11, 1));
+
+  // Activate the parent tab again:
+  tabstrip.ActivateTabAt(0, true /* user_gesture */);
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+
+  // Open another link in a new background child tab (a sibling of child11).
+  tabstrip.InsertWebContentsAt(GetInsertionIndex(&tabstrip),
+                               CreateWebContentsWithID(12),
+                               TabStripModel::ADD_INHERIT_GROUP);
+  EXPECT_EQ("1 11 111 12 2", GetTabStripStateString(tabstrip));
+  EXPECT_EQ(1, GetID(tabstrip.GetActiveWebContents()));
+  // opener1 has three adjacent descendants (11, 111, 12)
+  EXPECT_EQ(3, tabstrip.GetIndexOfLastWebContentsOpenedBy(opener1, 0));
+  // child11 has only one adjacent descendant (111)
+  EXPECT_EQ(2, tabstrip.GetIndexOfLastWebContentsOpenedBy(child11, 1));
+
+  tabstrip.CloseAllTabs();
+  EXPECT_TRUE(tabstrip.empty());
+}
+
 // Tests that selection is shifted to the correct tab when a tab is closed.
 // If a tab is in the background when it is closed, the selection does not
 // change.
 // If a tab is in the foreground (selected),
 //   If that tab does not have an opener, selection shifts to the right.
 //   If the tab has an opener,
 //     The next tab (scanning LTR) in the entire strip that has the same opener
 //     is selected
 //     If there are no other tabs that have the same opener,
 //       The opener is selected
@@ skipping 1687 matching lines @@
   WebContents* moved_contents = strip_src.DetachWebContentsAt(1);
   EXPECT_EQ(contents2, moved_contents);
 
   // Attach the tab to the destination tab strip.
   strip_dst.AppendWebContents(moved_contents, true);
   EXPECT_TRUE(strip_dst.IsTabBlocked(0));
 
   strip_dst.CloseAllTabs();
   strip_src.CloseAllTabs();
 }