Fix restoring individual tabs from recently closed windows.

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.
 
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <vector>
@@ skipping 235 matching lines @@
 
 // Test that the menu is created for a mix of windows and tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
   std::unique_ptr<MockTRS> trs(new MockTRS(profile()));
   MockTRS::Entries entries;
 
   MockTRS::Tab tab1 = CreateSessionTab("http://google.com", "Google");
   tab1.id = 24;
   entries.push_back(&tab1);
 
+  // TODO(sdy): The tab ids below *must* be set after all of them have been
+  // pushed onto window.tabs. Otherwise, the ids will change when push_back
+  // reallocates the vector's storage and calls each tabs' copy ctor. Ugh.
+
   MockTRS::Window win1;
   win1.id = 30;
   win1.tabs.push_back(CreateSessionTab("http://foo.com", "foo"));
+  win1.tabs.push_back(CreateSessionTab("http://bar.com", "bar"));
   win1.tabs[0].id = 31;
-  win1.tabs.push_back(CreateSessionTab("http://bar.com", "bar"));
   win1.tabs[1].id = 32;
   entries.push_back(&win1);
 
   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("http://magic.com", "magic"));
+  win2.tabs.push_back(CreateSessionTab("http://goats.com", "goats"));
+  win2.tabs.push_back(CreateSessionTab("http://teleporter.com", "teleporter"));
   win2.tabs[0].id = 51;
-  win2.tabs.push_back(CreateSessionTab("http://goats.com", "goats"));
   win2.tabs[1].id = 52;
-  win2.tabs.push_back(CreateSessionTab("http://teleporter.com", "teleporter"));
-  win2.tabs[1].id = 53;
+  win2.tabs[2].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]);
 
   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(30, hist2->session_id);
   EXPECT_EQ(2U, hist2->tabs.size());
   // Do not test menu item title because it is localized.
   NSMenu* submenu1 = [item2 submenu];
   EXPECT_EQ(4U, [[submenu1 itemArray] count]);
   // Do not test Restore All Tabs because it is localiced.
   EXPECT_TRUE([[submenu1 itemAtIndex:1] isSeparatorItem]);
   EXPECT_NSEQ(@"foo", [[submenu1 itemAtIndex:2] title]);
   EXPECT_NSEQ(@"bar", [[submenu1 itemAtIndex:3] title]);
+  EXPECT_EQ(31, hist2->tabs[0]->session_id);
+  EXPECT_EQ(32, hist2->tabs[1]->session_id);
 
   NSMenuItem* item3 = [menu itemAtIndex:2];
   MockBridge::HistoryItem* hist3 = bridge_->HistoryItemForMenuItem(item3);
   EXPECT_TRUE(hist3);
   EXPECT_EQ(42, hist3->session_id);
   EXPECT_NSEQ(@"Apple", [item3 title]);
 
   NSMenuItem* item4 = [menu itemAtIndex:3];
   MockBridge::HistoryItem* hist4 = bridge_->HistoryItemForMenuItem(item4);
   EXPECT_TRUE(hist4);
   EXPECT_EQ(50, hist4->session_id);
   EXPECT_EQ(3U, hist4->tabs.size());
   // Do not test menu item title because it is localized.
   NSMenu* submenu2 = [item4 submenu];
   EXPECT_EQ(5U, [[submenu2 itemArray] count]);
   // Do not test Restore All Tabs because it is localiced.
   EXPECT_TRUE([[submenu2 itemAtIndex:1] isSeparatorItem]);
   EXPECT_NSEQ(@"magic", [[submenu2 itemAtIndex:2] title]);
   EXPECT_NSEQ(@"goats", [[submenu2 itemAtIndex:3] title]);
   EXPECT_NSEQ(@"teleporter", [[submenu2 itemAtIndex:4] title]);
+  EXPECT_EQ(51, hist4->tabs[0]->session_id);
+  EXPECT_EQ(52, hist4->tabs[1]->session_id);
+  EXPECT_EQ(53, hist4->tabs[2]->session_id);
 }
 
 // Tests that we properly request an icon from the FaviconService.
 TEST_F(HistoryMenuBridgeTest, GetFaviconForHistoryItem) {
   // Create a fake item.
   HistoryMenuBridge::HistoryItem item;
   item.title = base::ASCIIToUTF16("Title");
   item.url = GURL("http://google.com");
 
   // Request the icon.
@@ skipping 20 matching lines @@
   image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap);
   GotFaviconData(&item, image_result);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace