Reverting 14948.

chrome/browser/tabs/tab_strip_model_unittest.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/test_render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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) {
     return NULL;
   }
   virtual Browser* CreateNewStripWithContents(TabContents* contents,
                                               const gfx::Rect& window_bounds,
                                               const DockInfo& dock_info) {
     return NULL;
   }
@@ skipping 11 matching lines @@
   }
   virtual bool CanDuplicateContentsAt(int index) { return false; }
   virtual void DuplicateContentsAt(int index) {}
   virtual void CloseFrameAfterDragSession() {}
   virtual void CreateHistoricalTab(TabContents* contents) {}
   virtual bool RunUnloadListenerBeforeClosing(TabContents* contents) {
     return false;
   }
   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);
 };
 
 class TabStripModelTest : public RenderViewHostTestHarness {
  public:
   TabContents* CreateTabContents() {
     return new WebContents(profile(), NULL, 0, NULL);
   }
 
   // Forwards a URL "load" request through to our dummy TabContents
@@ skipping 229 matching lines @@
     EXPECT_TRUE(observer.StateEquals(2, s3));
     State s4(detached, 2, MockTabStripModelObserver::SELECT);
     s4.src_contents = contents2;
     s4.user_gesture = false;
     EXPECT_TRUE(observer.StateEquals(3, s4));
     observer.ClearStates();
   }
 
   // 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());
     State s1(contents3, 2, MockTabStripModelObserver::CLOSE);
     EXPECT_TRUE(observer.StateEquals(0, s1));
     State s2(contents3, 2, MockTabStripModelObserver::DETACH);
     EXPECT_TRUE(observer.StateEquals(1, s2));
     State s3(contents2, 1, MockTabStripModelObserver::SELECT);
     s3.src_contents = contents3;
     s3.user_gesture = false;
@@ skipping 853 matching lines @@
 
   // Now select the last tab.
   strip.SelectTabContentsAt(strip.count() - 1, true);
 
   // Now close the last tab. The next adjacent should be selected.
   strip.CloseTabContentsAt(strip.count() - 1);
   EXPECT_EQ(page_d_contents, strip.GetTabContentsAt(strip.selected_index()));
 
   strip.CloseAllTabs();
 }