Nuke the deprecated ctor of TabMenuModel.

R=sky@chromium.org
TEST=unit_tests --gtest_filter=TabMenuModelTest*

Review URL: http://codereview.chromium.org/7844004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100732 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 48 deletions

diff --git a/chrome/browser/ui/tabs/tab_menu_model.cc b/chrome/browser/ui/tabs/tab_menu_model.cc
index f5f48d7..0f30eb1 100644
--- a/chrome/browser/ui/tabs/tab_menu_model.cc
+++ b/chrome/browser/ui/tabs/tab_menu_model.cc
@@ -10,12 +10,6 @@
 #include "grit/generated_resources.h"
 
 TabMenuModel::TabMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                           bool is_pinned)
-    : ui::SimpleMenuModel(delegate) {
-  Build(is_pinned);
-}
-
-TabMenuModel::TabMenuModel(ui::SimpleMenuModel::Delegate* delegate,
                            TabStripModel* tab_strip,
                            int index)
     : ui::SimpleMenuModel(delegate) {
@@ -38,40 +32,6 @@ bool TabMenuModel::IsCompactNavigationModeEnabled() {
   return false;
 }
 
-
-void TabMenuModel::Build(bool is_pinned) {
-  AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB);
-  AddSeparator();
-  AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD);
-  AddItemWithStringId(TabStripModel::CommandDuplicate,
-                      IDS_TAB_CXMENU_DUPLICATE);
-  AddItemWithStringId(
-      TabStripModel::CommandTogglePinned,
-      is_pinned ? IDS_TAB_CXMENU_UNPIN_TAB : IDS_TAB_CXMENU_PIN_TAB);
-  AddSeparator();
-  AddItemWithStringId(TabStripModel::CommandCloseTab,
-                      IDS_TAB_CXMENU_CLOSETAB);
-  AddItemWithStringId(TabStripModel::CommandCloseOtherTabs,
-                      IDS_TAB_CXMENU_CLOSEOTHERTABS);
-  AddItemWithStringId(TabStripModel::CommandCloseTabsToRight,
-                      IDS_TAB_CXMENU_CLOSETABSTORIGHT);
-  AddSeparator();
-  AddItemWithStringId(TabStripModel::CommandRestoreTab, IDS_RESTORE_TAB);
-  AddItemWithStringId(TabStripModel::CommandBookmarkAllTabs,
-                      IDS_TAB_CXMENU_BOOKMARK_ALL_TABS);
-  if (AreVerticalTabsEnabled() || IsCompactNavigationModeEnabled()) {
-    AddSeparator();
-    if (AreVerticalTabsEnabled()) {
-      AddCheckItemWithStringId(TabStripModel::CommandUseVerticalTabs,
-                               IDS_TAB_CXMENU_USE_VERTICAL_TABS);
-    }
-    if (IsCompactNavigationModeEnabled()) {
-      AddCheckItemWithStringId(TabStripModel::CommandUseCompactNavigationBar,
-                               IDS_TAB_CXMENU_USE_COMPACT_NAVIGATION_BAR);
-    }
-  }
-}
-
 void TabMenuModel::Build(TabStripModel* tab_strip, int index) {
   bool affects_multiple_tabs =
       (tab_strip->IsTabSelected(index) &&
diff --git a/chrome/browser/ui/tabs/tab_menu_model.h b/chrome/browser/ui/tabs/tab_menu_model.h
index 234a201..650be24 100644
--- a/chrome/browser/ui/tabs/tab_menu_model.h
+++ b/chrome/browser/ui/tabs/tab_menu_model.h
@@ -15,8 +15,6 @@ class TabStripModel;
 // created each time the menu is shown.
 class TabMenuModel : public ui::SimpleMenuModel {
  public:
-  // TODO: nuke this constructor when callers are updated.
-  TabMenuModel(ui::SimpleMenuModel::Delegate* delegate, bool is_pinned);
   TabMenuModel(ui::SimpleMenuModel::Delegate* delegate,
                TabStripModel* tab_strip,
                int index);
@@ -29,8 +27,6 @@ class TabMenuModel : public ui::SimpleMenuModel {
   static bool IsCompactNavigationModeEnabled();
 
  private:
-  // TODO: nuke this when first constructor is removed.
-  void Build(bool is_pinned);
   void Build(TabStripModel* tab_strip, int index);
 
   DISALLOW_COPY_AND_ASSIGN(TabMenuModel);
diff --git a/chrome/browser/ui/tabs/tab_menu_model_unittest.cc b/chrome/browser/ui/tabs/tab_menu_model_unittest.cc
index 47ffb30..2f8a503 100644
--- a/chrome/browser/ui/tabs/tab_menu_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_menu_model_unittest.cc
@@ -1,18 +1,20 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_menu_model.h"
 
+#include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/menu_model_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
 
-class TabMenuModelTest : public PlatformTest, public MenuModelTest {
+class TabMenuModelTest : public MenuModelTest,
+                         public BrowserWithTestWindowTest {
 };
 
 TEST_F(TabMenuModelTest, Basics) {
-  TabMenuModel model(&delegate_, true);
+  browser()->NewTab();
+  TabMenuModel model(&delegate_, browser()->tabstrip_model(), 0);
 
   // Verify it has items. The number varies by platform, so we don't check
   // the exact number.