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

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

 // Copyright 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/toolbar/recent_tabs_sub_menu_model.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 422 matching lines @@
                              IDS_RECENTLY_CLOSED);
 #if defined(OS_MACOSX)
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     SetIcon(last_local_model_index_,
             rb.GetNativeImageNamed(IDR_RECENTLY_CLOSED_WINDOW));
 #else
     SetIcon(last_local_model_index_, CreateFavicon(gfx::VectorIconId::TAB));
 #endif
 
     int added_count = 0;
-    sessions::TabRestoreService::Entries entries = service->entries();
-    for (sessions::TabRestoreService::Entries::const_iterator it =
-             entries.begin();
-         it != entries.end() && added_count < kMaxLocalEntries; ++it) {
-      sessions::TabRestoreService::Entry* entry = *it;
-      if (entry->type == sessions::TabRestoreService::TAB) {
-        sessions::TabRestoreService::Tab* tab =
-            static_cast<sessions::TabRestoreService::Tab*>(entry);
-        const sessions::SerializedNavigationEntry& current_navigation =
-            tab->navigations.at(tab->current_navigation_index);
-        BuildLocalTabItem(
-            entry->id,
-            current_navigation.title(),
-            current_navigation.virtual_url(),
-            ++last_local_model_index_);
-      } else  {
-        DCHECK_EQ(entry->type, sessions::TabRestoreService::WINDOW);
-        BuildLocalWindowItem(
-            entry->id, static_cast<sessions::TabRestoreService::Window*>(entry)
-                           ->tabs.size(),
-            ++last_local_model_index_);
+    for (const auto &entry : service->entries()) {
+      if (added_count == kMaxLocalEntries) {
+        break;
+      }
+      switch (entry->type()) {
+        case sessions::TabRestoreService::TAB: {
+          auto& tab =
+              static_cast<const sessions::TabRestoreService::Tab&>(*entry);
+          const sessions::SerializedNavigationEntry& current_navigation =
+            tab.navigations.at(tab.current_navigation_index);
+          BuildLocalTabItem(
+              entry->id,
+              current_navigation.title(),
+              current_navigation.virtual_url(),
+              ++last_local_model_index_);
+          break; }
+        case sessions::TabRestoreService::WINDOW: {
+          BuildLocalWindowItem(
+              entry->id,
+              static_cast<const sessions::TabRestoreService::Window&>(*entry)
+                  .tabs.size(),
+              ++last_local_model_index_);
+          break; }
       }
       ++added_count;
     }
   }
   DCHECK_GE(last_local_model_index_, 0);
 }
 
 void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() {
   // All other devices' items (device headers or tabs) use AddItem*() to append
   // a menu item, because they are always only built once (i.e. invoked from
@@ skipping 250 matching lines @@
 
   ui::MenuModelDelegate* menu_model_delegate = GetMenuModelDelegate();
   if (menu_model_delegate)
     menu_model_delegate->OnMenuStructureChanged();
 }
 
 void RecentTabsSubMenuModel::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {
   TabRestoreServiceChanged(service);
 }