Add option to disallow the discarding of a tab that was previously discarded.

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"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tabs/tab_discard_state.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 2102 matching lines @@
   tabstrip.AppendWebContents(contents2, true);
 
   // Start watching for events after the appends to avoid observing state
   // transitions that aren't relevant to this test.
   MockTabStripModelObserver tabstrip_observer(&tabstrip);
   tabstrip.AddObserver(&tabstrip_observer);
 
   // Discard one of the tabs.
   WebContents* null_contents1 = tabstrip.DiscardWebContentsAt(0);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_TRUE(tabstrip.IsTabDiscarded(0));
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_TRUE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
   ASSERT_EQ(null_contents1, tabstrip.GetWebContentsAt(0));
   ASSERT_EQ(contents2, tabstrip.GetWebContentsAt(1));
   ASSERT_EQ(1, tabstrip_observer.GetStateCount());
   State state1(null_contents1, 0, MockTabStripModelObserver::REPLACED);
   state1.src_contents = contents1;
   EXPECT_TRUE(tabstrip_observer.StateEquals(0, state1));
   tabstrip_observer.ClearStates();
 
   // Discard the same tab again.
   WebContents* null_contents2 = tabstrip.DiscardWebContentsAt(0);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_TRUE(tabstrip.IsTabDiscarded(0));
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_TRUE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
   ASSERT_EQ(null_contents2, tabstrip.GetWebContentsAt(0));
   ASSERT_EQ(contents2, tabstrip.GetWebContentsAt(1));
   ASSERT_EQ(1, tabstrip_observer.GetStateCount());
   State state2(null_contents2, 0, MockTabStripModelObserver::REPLACED);
   state2.src_contents = null_contents1;
   EXPECT_TRUE(tabstrip_observer.StateEquals(0, state2));
   tabstrip_observer.ClearStates();
 
   // Activating the tab should clear its discard state.
   tabstrip.ActivateTabAt(0, true /* user_gesture */);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(0));
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
 
   // Don't discard active tab.
   tabstrip.DiscardWebContentsAt(0);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(0));
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.CloseAllTabs();
 }
 
 // Makes sure that reloading a discarded tab without activating it unmarks the
 // tab as discarded so it won't reload on activation.
 TEST_F(TabStripModelTest, ReloadDiscardedTabContextMenu) {
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
 
   // Create 2 tabs because the active tab cannot be discarded.
   tabstrip.AppendWebContents(CreateWebContents(), true);
   content::WebContents* test_contents =
       WebContentsTester::CreateTestWebContents(browser_context(), nullptr);
   tabstrip.AppendWebContents(test_contents, false);  // Opened in background.
 
   // Navigate to a web page. This is necessary to set a current entry in memory
   // so the reload can happen.
   WebContentsTester::For(test_contents)
       ->NavigateAndCommit(GURL("chrome://newtab"));
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.DiscardWebContentsAt(1);
-  EXPECT_TRUE(tabstrip.IsTabDiscarded(1));
+  EXPECT_TRUE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.GetWebContentsAt(1)->GetController().Reload(false);
-  EXPECT_FALSE(tabstrip.IsTabDiscarded(1));
+  EXPECT_FALSE(TabDiscardState::IsDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.CloseAllTabs();
 }
 
 // Makes sure that the last active time property is saved even though the tab is
 // discarded.
 TEST_F(TabStripModelTest, DiscardedTabKeepsLastActiveTime) {
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
 
@@ skipping 412 matching lines @@
   WebContents* page_d_contents = CreateWebContents();
   strip.AddWebContents(page_c_contents, -1, ui::PAGE_TRANSITION_LINK,
                        TabStripModel::ADD_NONE);
   strip.AddWebContents(page_d_contents, -1, ui::PAGE_TRANSITION_LINK,
                        TabStripModel::ADD_NONE);
 
   EXPECT_EQ(2, strip.GetIndexOfWebContents(page_c_contents));
   EXPECT_EQ(3, strip.GetIndexOfWebContents(page_d_contents));
   strip.CloseAllTabs();
 }