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

chrome/browser/ui/views/frame/global_menu_bar_x11.cc

 // Copyright 2013 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/views/frame/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 #include <stddef.h>
 
@@ skipping 733 matching lines @@
 
   // We'll get the index the "Recently Closed" header. (This can vary depending
   // on the number of "Most Visited" items.
   int index = GetIndexOfMenuItemWithTag(history_menu_,
                                         TAG_RECENTLY_CLOSED_HEADER) + 1;
 
   unsigned int added_count = 0;
   for (sessions::TabRestoreService::Entries::const_iterator it =
            entries.begin();
        it != entries.end() && added_count < kRecentlyClosedCount; ++it) {
-    sessions::TabRestoreService::Entry* entry = *it;
+    sessions::TabRestoreService::Entry* entry = it->get();
 
     if (entry->type == sessions::TabRestoreService::WINDOW) {
       sessions::TabRestoreService::Window* entry_win =
           static_cast<sessions::TabRestoreService::Window*>(entry);
-      std::vector<sessions::TabRestoreService::Tab>& tabs = entry_win->tabs;
+      auto& tabs = entry_win->tabs;
       if (tabs.empty())
         continue;
 
       // Create the item for the parent/window.
       HistoryItem* item = new HistoryItem();
       item->session_id = entry_win->id;
 
       std::string title = l10n_util::GetPluralStringFUTF8(
           IDS_RECENTLY_CLOSED_WINDOW, tabs.size());
       DbusmenuMenuitem* parent_item = BuildMenuItem(
@@ skipping 15 matching lines @@
                              DeleteHistoryItem);
       menuitem_child_append(parent_item, restore_item);
       g_object_unref(restore_item);
 
       DbusmenuMenuitem* separator = BuildSeparator();
       menuitem_child_append(parent_item, separator);
       g_object_unref(separator);
 
       // Loop over the window's tabs and add them to the submenu.
       int subindex = 2;
-      std::vector<sessions::TabRestoreService::Tab>::const_iterator iter;
-      for (iter = tabs.begin(); iter != tabs.end(); ++iter) {
-        sessions::TabRestoreService::Tab tab = *iter;
-        HistoryItem* tab_item = HistoryItemForTab(tab);
+      for (const auto& tab : tabs) {
+        HistoryItem* tab_item = HistoryItemForTab(*tab);
         item->tabs.push_back(tab_item);
         AddHistoryItemToMenu(tab_item,
                              parent_item,
                              TAG_RECENTLY_CLOSED,
                              subindex++);
       }
 
       ++added_count;
     } else if (entry->type == sessions::TabRestoreService::TAB) {
       sessions::TabRestoreService::Tab* tab =
@@ skipping 80 matching lines @@
                                                   unsigned int timestamp) {
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), kProfileId));
   avatar_menu_->EditProfile(id);
 }
 
 void GlobalMenuBarX11::OnCreateProfileItemActivated(DbusmenuMenuitem* sender,
                                                     unsigned int timestamp) {
   profiles::CreateAndSwitchToNewProfile(ProfileManager::CreateCallback(),
                                         ProfileMetrics::ADD_NEW_USER_MENU);
 }