Removes phantom tabs.

chrome/browser/tabs/tab_strip_model_unittest.cc

 // Copyright (c) 2010 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 "app/system_monitor.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 131 matching lines @@
       if (i > 0)
         actual += " ";
 
       actual += IntToString(GetID(model.GetTabContentsAt(i)));
 
       if (model.IsAppTab(i))
         actual += "a";
 
       if (model.IsTabPinned(i))
         actual += "p";
-
-      if (model.IsPhantomTab(i))
-        actual += "h";
     }
     return actual;
   }
 
   std::string GetIndicesClosedByCommandAsString(
       const TabStripModel& model,
       int index,
       TabStripModel::ContextMenuCommand id) const {
     std::vector<int> indices = model.GetIndicesClosedByCommand(index, id);
     std::string result;
@@ skipping 29 matching lines @@
   }
 
   enum TabStripModelObserverAction {
     INSERT,
     CLOSE,
     DETACH,
     SELECT,
     MOVE,
     CHANGE,
     PINNED,
-    REPLACED
   };
 
   struct State {
     State(TabContents* a_dst_contents,
           int a_dst_index,
           TabStripModelObserverAction a_action)
         : src_contents(NULL),
           dst_contents(a_dst_contents),
           src_index(-1),
           dst_index(a_dst_index),
@@ skipping 66 matching lines @@
   virtual void TabClosingAt(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, CLOSE));
   }
   virtual void TabDetachedAt(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, DETACH));
   }
   virtual void TabChangedAt(TabContents* contents, int index,
                             TabChangeType change_type) {
     states_.push_back(new State(contents, index, CHANGE));
   }
-  virtual void TabReplacedAt(TabContents* old_contents,
-                             TabContents* new_contents, int index) {
-    State* s = new State(new_contents, index, REPLACED);
-    s ->src_contents = old_contents;
-    states_.push_back(s);
-  }
   virtual void TabPinnedStateChanged(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, PINNED));
   }
   virtual void TabStripEmpty() {
     empty_ = true;
   }
 
   void ClearStates() {
     STLDeleteContainerPointers(states_.begin(), states_.end());
     states_.clear();
@@ skipping 1453 matching lines @@
 
     ASSERT_EQ(1, observer.GetStateCount());
     State state(contents4, 2, MockTabStripModelObserver::INSERT);
     EXPECT_TRUE(observer.StateEquals(0, state));
 
     EXPECT_EQ("1p 3p 4 2", GetPinnedState(tabstrip));
   }
 
   tabstrip.CloseAllTabs();
 }
-
-// Tests various permutations of making a tab phantom.
-TEST_F(TabStripModelTest, Phantom) {
-  TabStripDummyDelegate delegate(NULL);
-  TabStripModel tabstrip(&delegate, profile());
-  MockTabStripModelObserver observer;
-  tabstrip.AddObserver(&observer);
-
-  EXPECT_TRUE(tabstrip.empty());
-
-  typedef MockTabStripModelObserver::State State;
-
-  TabContents* contents1 = CreateTabContents();
-  TabContents* contents2 = CreateTabContents();
-  TabContents* contents3 = CreateTabContents();
-
-  SetID(contents1, 1);
-  SetID(contents2, 2);
-  SetID(contents3, 3);
-
-  // Note! The ordering of these tests is important, each subsequent test
-  // builds on the state established in the previous. This is important if you
-  // ever insert tests rather than append.
-
-  // Initial state, three tabs, first selected.
-  tabstrip.AppendTabContents(contents1, true);
-  tabstrip.AppendTabContents(contents2, false);
-  tabstrip.AppendTabContents(contents3, false);
-
-  observer.ClearStates();
-
-  // Pin the first tab, and make it phantom.
-  {
-    tabstrip.SetTabPinned(0, true);
-
-    observer.ClearStates();
-
-    tabstrip.CloseTabContentsAt(0, TabStripModel::CLOSE_NONE);
-
-    // The tabcontents should have changed.
-    TabContents* old_contents1 = contents1;
-    TabContents* new_contents1 = tabstrip.GetTabContentsAt(0);
-    ASSERT_TRUE(new_contents1 != contents1);
-    contents1 = new_contents1;
-    SetID(contents1, 1);
-
-    // Verify the state.
-    EXPECT_EQ("1ph 2 3", GetPinnedState(tabstrip));
-
-    // We should have gotten notification of the following:
-    // . tab closing.
-    // . selection changed.
-    // . tab replaced.
-    ASSERT_EQ(3, observer.GetStateCount());
-    State state(old_contents1, 0, MockTabStripModelObserver::CLOSE);
-    EXPECT_TRUE(observer.StateEquals(0, state));
-    state = State(contents1, 0, MockTabStripModelObserver::REPLACED);
-    state.src_contents = old_contents1;
-    EXPECT_TRUE(observer.StateEquals(1, state));
-    state = State(contents2, 1, MockTabStripModelObserver::SELECT);
-    state.src_contents = contents1;
-    state.user_gesture = true;
-    EXPECT_TRUE(observer.StateEquals(2, state));
-
-    observer.ClearStates();
-  }
-
-  {
-    tabstrip.SetTabPinned(1, true);
-    observer.ClearStates();
-
-    // Close the second tab, which should make it phantom.
-    tabstrip.CloseTabContentsAt(1, TabStripModel::CLOSE_NONE);
-
-    // The tabcontents should have changed.
-    TabContents* new_contents2 = tabstrip.GetTabContentsAt(1);
-    ASSERT_TRUE(new_contents2 != contents2);
-    contents2 = new_contents2;
-    SetID(contents2, 2);
-
-    EXPECT_EQ("1ph 2ph 3", GetPinnedState(tabstrip));
-
-    EXPECT_EQ(2, tabstrip.selected_index());
-
-    contents2 = tabstrip.GetTabContentsAt(1);
-
-    observer.ClearStates();
-  }
-
-  {
-    tabstrip.SetTabPinned(2, true);
-    observer.ClearStates();
-
-    // Close the last tab, we should get a tabstrip empty notification.
-    tabstrip.CloseTabContentsAt(2, TabStripModel::CLOSE_NONE);
-
-    // The tabcontents should have changed.
-    TabContents* old_contents3 = contents3;
-    TabContents* new_contents3 = tabstrip.GetTabContentsAt(2);
-    ASSERT_TRUE(new_contents3 != contents3);
-    contents3 = new_contents3;
-    SetID(contents3, 3);
-
-    EXPECT_EQ("1ph 2ph 3ph", GetPinnedState(tabstrip));
-
-    // We should have gotten notification of the following:
-    // . tab closing.
-    // . tab replaced.
-    // . tabstrip empty.
-    ASSERT_EQ(2, observer.GetStateCount());
-    State state(old_contents3, 2, MockTabStripModelObserver::CLOSE);
-    EXPECT_TRUE(observer.StateEquals(0, state));
-    state = State(contents3, 2, MockTabStripModelObserver::REPLACED);
-    state.src_contents = old_contents3;
-    EXPECT_TRUE(observer.StateEquals(1, state));
-    EXPECT_TRUE(observer.empty());
-
-    observer.ClearStates();
-  }
-
-  // Clean up the phantom tabs.
-  tabstrip.CloseAllTabs();
-}