Reverting 14948.

chrome/browser/tabs/tab_strip_model_unittest.cc

Index: chrome/browser/tabs/tab_strip_model_unittest.cc
===================================================================
--- chrome/browser/tabs/tab_strip_model_unittest.cc	(revision 14948)
+++ chrome/browser/tabs/tab_strip_model_unittest.cc	(working copy)
@@ -22,11 +22,9 @@
 class TabStripDummyDelegate : public TabStripModelDelegate {
  public:
   explicit TabStripDummyDelegate(TabContents* dummy)
-      : dummy_contents_(dummy), can_close_(true) {}
+      : dummy_contents_(dummy) {}
   virtual ~TabStripDummyDelegate() {}
 
-  void set_can_close(bool value) { can_close_ = value; }
-
   // Overridden from TabStripModelDelegate:
   virtual TabContents* AddBlankTab(bool foreground) { return NULL; }
   virtual TabContents* AddBlankTabAt(int index, bool foreground) {
@@ -58,16 +56,12 @@
   }
   virtual bool CanRestoreTab() { return false; }
   virtual void RestoreTab() {}
-  virtual bool CanCloseContentsAt(int index) { return can_close_ ; }
 
  private:
   // A dummy TabContents we give to callers that expect us to actually build a
   // Destinations tab for them.
   TabContents* dummy_contents_;
 
-  // Whether tabs can be closed.
-  bool can_close_;
-
   DISALLOW_EVIL_CONSTRUCTORS(TabStripDummyDelegate);
 };
 
@@ -317,15 +311,7 @@
 
   // Test CloseTabContentsAt
   {
-    // Let's test nothing happens when the delegate veto the close.
-    delegate.set_can_close(false);
-    EXPECT_FALSE(tabstrip.CloseTabContentsAt(2));
-    EXPECT_EQ(3, tabstrip.count());
-    EXPECT_EQ(0, observer.GetStateCount());
-
-    // Now let's close for real.
-    delegate.set_can_close(true);
-    EXPECT_TRUE(tabstrip.CloseTabContentsAt(2));
+    tabstrip.CloseTabContentsAt(2);
     EXPECT_EQ(2, tabstrip.count());
 
     EXPECT_EQ(3, observer.GetStateCount());