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

chrome/browser/win/jumplist.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/win/jumplist.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 381 matching lines @@
   //   The last URL of the tab object.
   // * title
   //   The title of the last URL.
   // * icon
   //   An empty string. This value is to be updated in OnFaviconDataAvailable().
   // This code is copied from
   // RecentlyClosedTabsHandler::TabRestoreServiceChanged() to emulate it.
   const int kRecentlyClosedCount = 4;
   sessions::TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile_);
-  const sessions::TabRestoreService::Entries& entries =
-      tab_restore_service->entries();
-  for (sessions::TabRestoreService::Entries::const_iterator it =
-           entries.begin();
-       it != entries.end(); ++it) {
-    const sessions::TabRestoreService::Entry* entry = *it;
-    if (entry->type == sessions::TabRestoreService::TAB) {
-      AddTab(static_cast<const sessions::TabRestoreService::Tab*>(entry),
-             &temp_list, kRecentlyClosedCount);
-    } else if (entry->type == sessions::TabRestoreService::WINDOW) {
-      AddWindow(static_cast<const sessions::TabRestoreService::Window*>(entry),
-                &temp_list, kRecentlyClosedCount);
+  for (const auto& entry : tab_restore_service->entries()) {
+    switch (entry->type) {
+      case sessions::TabRestoreService::TAB:
+        AddTab(static_cast<const sessions::TabRestoreService::Tab&>(*entry),
+               &temp_list, kRecentlyClosedCount);
+        break;
+      case sessions::TabRestoreService::WINDOW:
+        AddWindow(
+            static_cast<const sessions::TabRestoreService::Window&>(*entry),
+            &temp_list, kRecentlyClosedCount);
+        break;
     }
   }
   // Lock recently_closed_pages and copy temp_list into it.
   {
     JumpListData* data = &jumplist_data_->data;
     base::AutoLock auto_lock(data->list_lock_);
     data->recently_closed_pages_ = temp_list;
   }
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavicon();
 }
 
 void JumpList::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {}
 
-bool JumpList::AddTab(const sessions::TabRestoreService::Tab* tab,
+bool JumpList::AddTab(const sessions::TabRestoreService::Tab& tab,
                       ShellLinkItemList* list,
                       size_t max_items) {
   DCHECK(CalledOnValidThread());
 
   // This code adds the URL and the title strings of the given tab to the
   // specified list.
   if (list->size() >= max_items)
     return false;
 
   scoped_refptr<ShellLinkItem> link = CreateShellLink();
   const sessions::SerializedNavigationEntry& current_navigation =
-      tab->navigations.at(tab->current_navigation_index);
+      tab.navigations.at(tab.current_navigation_index);
   std::string url = current_navigation.virtual_url().spec();
   link->GetCommandLine()->AppendArgNative(base::UTF8ToWide(url));
   link->GetCommandLine()->AppendSwitchASCII(
       switches::kWinJumplistAction, jumplist::kRecentlyClosedCategory);
   link->set_title(current_navigation.title());
   list->push_back(link);
   {
     JumpListData* data = &jumplist_data_->data;
     base::AutoLock auto_lock(data->list_lock_);
     data->icon_urls_.push_back(std::make_pair(std::move(url), std::move(link)));
   }
   return true;
 }
 
-void JumpList::AddWindow(const sessions::TabRestoreService::Window* window,
+void JumpList::AddWindow(const sessions::TabRestoreService::Window& window,
                          ShellLinkItemList* list,
                          size_t max_items) {
   DCHECK(CalledOnValidThread());
 
   // This code enumerates al the tabs in the given window object and add their
   // URLs and titles to the list.
-  DCHECK(!window->tabs.empty());
+  DCHECK(!window.tabs.empty());
 
-  for (size_t i = 0; i < window->tabs.size(); ++i) {
-    if (!AddTab(&window->tabs[i], list, max_items))
+  for (const auto& tab : window.tabs) {
+    if (!AddTab(*tab, list, max_items))
       return;
   }
 }
 
 void JumpList::StartLoadingFavicon() {
   DCHECK(CalledOnValidThread());
 
   GURL url;
   bool waiting_for_icons = true;
   {
@@ skipping 103 matching lines @@
 void JumpList::TopSitesLoaded(history::TopSites* top_sites) {
 }
 
 void JumpList::TopSitesChanged(history::TopSites* top_sites,
                                ChangeReason change_reason) {
   top_sites->GetMostVisitedURLs(
       base::Bind(&JumpList::OnMostVisitedURLsAvailable,
                  weak_ptr_factory_.GetWeakPtr()),
       false);
 }