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

chrome/browser/ui/tabs/tab_strip_model_unittest.cc

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 479fb17859620f2736a734687f3b6b78ab4af8e7..eec5385667a43b7a730cfe03ab881a4f338c725a 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -19,6 +19,7 @@
 #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"
@@ -2141,8 +2142,8 @@ TEST_F(TabStripModelTest, DiscardWebContentsAt) {
   // 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());
@@ -2154,8 +2155,8 @@ TEST_F(TabStripModelTest, DiscardWebContentsAt) {
   // 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());
@@ -2167,14 +2168,14 @@ TEST_F(TabStripModelTest, DiscardWebContentsAt) {
   // 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();
 }
@@ -2195,13 +2196,13 @@ TEST_F(TabStripModelTest, ReloadDiscardedTabContextMenu) {
   // 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();
 }