Make TabRestoreService::Entry noncopyable and fix up surrounding code.

chrome/browser/ui/cocoa/history_menu_bridge.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"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 119 matching lines @@
   const sessions::TabRestoreService::Entries& entries = service->entries();
 
   // Clear the history menu before rebuilding.
   NSMenu* menu = HistoryMenu();
   ClearMenuSection(menu, kRecentlyClosed);
 
   // Index for the next menu item.
   NSInteger index = [menu indexOfItemWithTag:kRecentlyClosedTitle] + 1;
   NSUInteger added_count = 0;
 
-  for (sessions::TabRestoreService::Entries::const_iterator it =
-           entries.begin();
-       it != entries.end() && added_count < kRecentlyClosedCount; ++it) {
-    sessions::TabRestoreService::Entry* entry = *it;
-
+  for (const auto& entry : entries) {
+    if (added_count >= kRecentlyClosedCount)
+      break;
     // If this is a window, create a submenu for all of its tabs.
     if (entry->type == sessions::TabRestoreService::WINDOW) {
-      sessions::TabRestoreService::Window* entry_win =
-          (sessions::TabRestoreService::Window*)entry;
-      std::vector<sessions::TabRestoreService::Tab>& tabs = entry_win->tabs;
+      const auto* entry_win =
+          static_cast<sessions::TabRestoreService::Window*>(entry.get());
+      const std::vector<std::unique_ptr<sessions::TabRestoreService::Tab>>&
+          tabs = entry_win->tabs;
       if (tabs.empty())
         continue;
 
       // Create the item for the parent/window. Do not set the title yet because
       // the actual number of items that are in the menu will not be known until
       // things like the NTP are filtered out, which is done when the tab items
       // are actually created.
       HistoryItem* item = new HistoryItem();
       item->session_id = entry_win->id;
 
@@ skipping 11 matching lines @@
       // Duplicate the HistoryItem otherwise the different NSMenuItems will
       // point to the same HistoryItem, which would then be double-freed when
       // removing the items from the map or in the dtor.
       HistoryItem* dup_item = new HistoryItem(*item);
       menu_item_map_.insert(std::make_pair(restore_item.get(), dup_item));
       [submenu addItem:restore_item.get()];
       [submenu addItem:[NSMenuItem separatorItem]];
 
       // Loop over the window's tabs and add them to the submenu.
       NSInteger subindex = [[submenu itemArray] count];
-      std::vector<sessions::TabRestoreService::Tab>::const_iterator it;
-      for (it = tabs.begin(); it != tabs.end(); ++it) {
-        HistoryItem* tab_item = HistoryItemForTab(*it);
+      for (const auto& tab : tabs) {
+        HistoryItem* tab_item = HistoryItemForTab(*tab);
         if (tab_item) {
           item->tabs.push_back(tab_item);
           AddItemToMenu(tab_item, submenu.get(), kRecentlyClosed + 1,
                         subindex++);
         }
       }
 
       // Now that the number of tabs that has been added is known, set the title
       // of the parent menu item.
       item->title = l10n_util::GetPluralStringFUTF16(
           IDS_RECENTLY_CLOSED_WINDOW, item->tabs.size());
 
       // Sometimes it is possible for there to not be any subitems for a given
       // window; if that is the case, do not add the entry to the main menu.
       if ([[submenu itemArray] count] > 2) {
         // Create the menu item parent.
         NSMenuItem* parent_item =
             AddItemToMenu(item, menu, kRecentlyClosed, index++);
         [parent_item setSubmenu:submenu.get()];
         ++added_count;
       }
     } else if (entry->type == sessions::TabRestoreService::TAB) {
-      sessions::TabRestoreService::Tab* tab =
-          static_cast<sessions::TabRestoreService::Tab*>(entry);
-      HistoryItem* item = HistoryItemForTab(*tab);
+      const auto& tab = static_cast<sessions::TabRestoreService::Tab&>(*entry);
+      HistoryItem* item = HistoryItemForTab(tab);
       if (item) {
         AddItemToMenu(item, menu, kRecentlyClosed, index++);
         ++added_count;
       }
     }
   }
 }
 
 void HistoryMenuBridge::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {
@@ skipping 234 matching lines @@
                                       const history::URLRows& deleted_rows,
                                       const std::set<GURL>& favicon_urls) {
   OnHistoryChanged();
 }
 
 void HistoryMenuBridge::OnHistoryServiceLoaded(
     history::HistoryService* history_service) {
   history_service_ = history_service;
   Init();
 }