Begin to upgrade BackForwardMenuModelViews to use new menu API....

chrome/browser/back_forward_menu_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 "chrome/browser/back_forward_menu_model.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 47 matching lines @@
     rvh()->SendNavigate(entry->page_id(), entry->url());
   }
   void GoForward() {
     controller().GoForward();
     const NavigationEntry* entry = controller().pending_entry();
     rvh()->SendNavigate(entry->page_id(), entry->url());
   }
 };
 
 TEST_F(BackFwdMenuModelTest, BasicCase) {
-  scoped_ptr<BackForwardMenuModel> back_model(BackForwardMenuModel::Create(
-      NULL, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel(
+      NULL, BackForwardMenuModel::BACKWARD_MENU));
   back_model->set_test_tab_contents(contents());
 
-  scoped_ptr<BackForwardMenuModel> forward_model(BackForwardMenuModel::Create(
-      NULL, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel(
+      NULL, BackForwardMenuModel::FORWARD_MENU));
   forward_model->set_test_tab_contents(contents());
 
   EXPECT_EQ(0, back_model->GetTotalItemCount());
   EXPECT_EQ(0, forward_model->GetTotalItemCount());
   EXPECT_FALSE(back_model->ItemHasCommand(1));
 
   // Seed the controller with a few URLs
   LoadURLAndUpdateState("http://www.a.com/1", "A1");
   LoadURLAndUpdateState("http://www.a.com/2", "A2");
   LoadURLAndUpdateState("http://www.a.com/3", "A3");
@@ skipping 41 matching lines @@
   EXPECT_EQ(L"A1", back_model->GetItemLabel(4));
   EXPECT_EQ(back_model->GetShowFullHistoryLabel(),
             back_model->GetItemLabel(6));
   EXPECT_EQ(L"C1", forward_model->GetItemLabel(1));
   EXPECT_EQ(L"C3", forward_model->GetItemLabel(3));
   EXPECT_EQ(forward_model->GetShowFullHistoryLabel(),
             forward_model->GetItemLabel(5));
 }
 
 TEST_F(BackFwdMenuModelTest, MaxItemsTest) {
-  scoped_ptr<BackForwardMenuModel> back_model(BackForwardMenuModel::Create(
-      NULL, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel(
+      NULL, BackForwardMenuModel::BACKWARD_MENU));
   back_model->set_test_tab_contents(contents());
 
-  scoped_ptr<BackForwardMenuModel> forward_model(BackForwardMenuModel::Create(
-      NULL, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel(
+      NULL, BackForwardMenuModel::FORWARD_MENU));
   forward_model->set_test_tab_contents(contents());
 
   // Seed the controller with 32 URLs
   LoadURLAndUpdateState("http://www.a.com/1", "A1");
   LoadURLAndUpdateState("http://www.a.com/2", "A2");
   LoadURLAndUpdateState("http://www.a.com/3", "A3");
   LoadURLAndUpdateState("http://www.b.com/1", "B1");
   LoadURLAndUpdateState("http://www.b.com/2", "B2");
   LoadURLAndUpdateState("http://www.b.com/3", "B3");
   LoadURLAndUpdateState("http://www.c.com/1", "C1");
@@ skipping 56 matching lines @@
   EXPECT_FALSE(forward_model->ItemHasCommand(
       BackForwardMenuModel::kMaxHistoryItems + 3 + chapter_stop_offset));
 
   EXPECT_TRUE(forward_model->ItemHasCommand(
       BackForwardMenuModel::kMaxHistoryItems));
   EXPECT_TRUE(forward_model->IsSeparator(
       BackForwardMenuModel::kMaxHistoryItems + 1));
 }
 
 TEST_F(BackFwdMenuModelTest, ChapterStops) {
-  scoped_ptr<BackForwardMenuModel> back_model(BackForwardMenuModel::Create(
-    NULL, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel(
+    NULL, BackForwardMenuModel::BACKWARD_MENU));
   back_model->set_test_tab_contents(contents());
 
-  scoped_ptr<BackForwardMenuModel> forward_model(BackForwardMenuModel::Create(
-      NULL, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
+  scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel(
+      NULL, BackForwardMenuModel::FORWARD_MENU));
   forward_model->set_test_tab_contents(contents());
 
   // Seed the controller with 32 URLs.
   int i = 0;
   LoadURLAndUpdateState("http://www.a.com/1", "A1"); // 0
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.a.com/2", "A2");
   ValidateModel(back_model.get(), i++, 0);
   LoadURLAndUpdateState("http://www.a.com/3", "A3");
   ValidateModel(back_model.get(), i++, 0);
@@ skipping 164 matching lines @@
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(0, true));
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(1, true));
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(2, true));
   EXPECT_EQ(4, back_model->GetIndexOfNextChapterStop(3, true));
   // And try backwards as well.
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(4, false));
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(3, false));
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(2, false));
   EXPECT_EQ(-1, back_model->GetIndexOfNextChapterStop(1, false));
 }