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

chrome/browser/sessions/tab_restore_browsertest.cc

 // 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 423 matching lines @@
   chrome::CloseWindow(browser());
   close_window_observer.Wait();
   EXPECT_EQ(1u, active_browser_list_->size());
 
   // Check that the TabRestoreService has the contents of the closed window.
   Browser* browser = GetBrowser(0);
   sessions::TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser->profile());
   const sessions::TabRestoreService::Entries& entries = service->entries();
   EXPECT_EQ(1u, entries.size());
-  sessions::TabRestoreService::Entry* entry = entries.front();
+  sessions::TabRestoreService::Entry* entry = entries.front().get();
   ASSERT_EQ(sessions::TabRestoreService::WINDOW, entry->type);
   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;
   EXPECT_EQ(3u, tabs.size());
 
   // Find the Tab to restore.
-  sessions::TabRestoreService::Tab tab_to_restore;
+  SessionID::id_type tab_id_to_restore = 0;
   bool found_tab_to_restore = false;
-  for (const auto& tab : tabs) {
+  for (const auto& tab_ptr : tabs) {
+    auto& tab = *tab_ptr;
     if (tab.navigations[tab.current_navigation_index].virtual_url() == url1_) {
-      tab_to_restore = tab;
+      tab_id_to_restore = tab.id;
       found_tab_to_restore = true;
       break;
     }
   }
   ASSERT_TRUE(found_tab_to_restore);
 
   // Restore the tab into the current window.
   EXPECT_EQ(1, browser->tab_strip_model()->count());
   content::WindowedNotificationObserver tab_added_observer(
       chrome::NOTIFICATION_TAB_PARENTED,
       content::NotificationService::AllSources());
   content::WindowedNotificationObserver tab_loaded_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  service->RestoreEntryById(browser->live_tab_context(), tab_to_restore.id,
+  service->RestoreEntryById(browser->live_tab_context(), tab_id_to_restore,
                             NEW_FOREGROUND_TAB);
   tab_added_observer.Wait();
   tab_loaded_observer.Wait();
 
   // Check that the tab was correctly restored.
   EXPECT_EQ(2, browser->tab_strip_model()->count());
   EXPECT_EQ(url1_,
             browser->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
@@ skipping 218 matching lines @@
   while (browser()->tab_strip_model()->count())
     CloseTab(0);
 }
 
 // Verifies restoring a tab works on startup.
 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) {
   ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1));
   EXPECT_EQ(url1_,
             browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL());
 }