Revamp TabNavigation class

chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

 // Copyright (c) 2012 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/cancelable_request.h"
+#include "chrome/browser/sessions/session_types_test_helper.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
@@ skipping 58 matching lines @@
   }
 
   HistoryMenuBridge::HistoryItem* CreateItem(const string16& title) {
     HistoryMenuBridge::HistoryItem* item =
         new HistoryMenuBridge::HistoryItem();
     item->title = title;
     item->url = GURL(title);
     return item;
   }
 
-  MockTRS::Tab CreateSessionTab(const GURL& url, const string16& title) {
+  MockTRS::Tab CreateSessionTab(const std::string& url,
+                                const std::string& title) {
     MockTRS::Tab tab;
     tab.current_navigation_index = 0;
     tab.navigations.push_back(
-        TabNavigation(0, url, content::Referrer(), title, std::string(),
-                      content::PAGE_TRANSITION_LINK));
+        SessionTypesTestHelper::CreateNavigation(url, title));
     return tab;
   }
 
   void GetFaviconForHistoryItem(HistoryMenuBridge::HistoryItem* item) {
     bridge_->GetFaviconForHistoryItem(item);
   }
 
   void GotFaviconData(
       FaviconService::Handle handle,
       const history::FaviconImageResult& image_result) {
@@ skipping 97 matching lines @@
   // e.g. http://foo becomes http://foo/)
   EXPECT_GE([[[menu itemAtIndex:0] toolTip] length], (2*short_url.length()-5));
   EXPECT_GE([[[menu itemAtIndex:1] toolTip] length], (2*long_url.length()-5));
 }
 
 // Test that the menu is created for a set of simple tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabs) {
   scoped_ptr<MockTRS> trs(new MockTRS(profile()));
   MockTRS::Entries entries;
 
-  MockTRS::Tab tab1 = CreateSessionTab(GURL("http://google.com"),
-                                       ASCIIToUTF16("Google"));
+  MockTRS::Tab tab1 = CreateSessionTab("http://google.com", "Google");
   tab1.id = 24;
   entries.push_back(&tab1);
 
-  MockTRS::Tab tab2 = CreateSessionTab(GURL("http://apple.com"),
-                                       ASCIIToUTF16("Apple"));
+  MockTRS::Tab tab2 = CreateSessionTab("http://apple.com", "Apple");
   tab2.id = 42;
   entries.push_back(&tab2);
 
   using ::testing::ReturnRef;
   EXPECT_CALL(*trs.get(), entries()).WillOnce(ReturnRef(entries));
 
   bridge_->TabRestoreServiceChanged(trs.get());
 
   NSMenu* menu = bridge_->HistoryMenu();
   ASSERT_EQ(2U, [[menu itemArray] count]);
 
   NSMenuItem* item1 = [menu itemAtIndex:0];
   MockBridge::HistoryItem* hist1 = bridge_->HistoryItemForMenuItem(item1);
   EXPECT_TRUE(hist1);
   EXPECT_EQ(24, hist1->session_id);
   EXPECT_NSEQ(@"Google", [item1 title]);
 
   NSMenuItem* item2 = [menu itemAtIndex:1];
   MockBridge::HistoryItem* hist2 = bridge_->HistoryItemForMenuItem(item2);
   EXPECT_TRUE(hist2);
   EXPECT_EQ(42, hist2->session_id);
   EXPECT_NSEQ(@"Apple", [item2 title]);
 }
 
 // Test that the menu is created for a mix of windows and tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
   scoped_ptr<MockTRS> trs(new MockTRS(profile()));
   MockTRS::Entries entries;
 
-  MockTRS::Tab tab1 = CreateSessionTab(GURL("http://google.com"),
-                                       ASCIIToUTF16("Google"));
+  MockTRS::Tab tab1 = CreateSessionTab("http://google.com", "Google");
   tab1.id = 24;
   entries.push_back(&tab1);
 
   MockTRS::Window win1;
   win1.id = 30;
-  win1.tabs.push_back(
-      CreateSessionTab(GURL("http://foo.com"), ASCIIToUTF16("foo")));
+  win1.tabs.push_back(CreateSessionTab("http://foo.com", "foo"));
   win1.tabs[0].id = 31;
-  win1.tabs.push_back(
-      CreateSessionTab(GURL("http://bar.com"), ASCIIToUTF16("bar")));
+  win1.tabs.push_back(CreateSessionTab("http://bar.com", "bar"));
   win1.tabs[1].id = 32;
   entries.push_back(&win1);
 
-  MockTRS::Tab tab2 = CreateSessionTab(GURL("http://apple.com"),
-                                       ASCIIToUTF16("Apple"));
+  MockTRS::Tab tab2 = CreateSessionTab("http://apple.com", "Apple");
   tab2.id = 42;
   entries.push_back(&tab2);
 
   MockTRS::Window win2;
   win2.id = 50;
-  win2.tabs.push_back(
-      CreateSessionTab(GURL("http://magic.com"), ASCIIToUTF16("magic")));
+  win2.tabs.push_back(CreateSessionTab("http://magic.com", "magic"));
   win2.tabs[0].id = 51;
-  win2.tabs.push_back(
-      CreateSessionTab(GURL("http://goats.com"), ASCIIToUTF16("goats")));
+  win2.tabs.push_back(CreateSessionTab("http://goats.com", "goats"));
   win2.tabs[1].id = 52;
-  win2.tabs.push_back(
-      CreateSessionTab(GURL("http://teleporter.com"),
-                       ASCIIToUTF16("teleporter")));
+  win2.tabs.push_back(CreateSessionTab("http://teleporter.com", "teleporter"));
   win2.tabs[1].id = 53;
   entries.push_back(&win2);
 
   using ::testing::ReturnRef;
   EXPECT_CALL(*trs.get(), entries()).WillOnce(ReturnRef(entries));
 
   bridge_->TabRestoreServiceChanged(trs.get());
 
   NSMenu* menu = bridge_->HistoryMenu();
   ASSERT_EQ(4U, [[menu itemArray] count]);
@@ skipping 76 matching lines @@
   image_result.image = gfx::Image(bitmap);
   GotFaviconData(item.icon_handle, image_result);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace