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

chrome/browser/ui/cocoa/history_menu_bridge_unittest.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"
 
 #import <Cocoa/Cocoa.h>
 
 #include <initializer_list>
 #include <memory>
@@ skipping 80 matching lines @@
 
   HistoryMenuBridge::HistoryItem* CreateItem(const base::string16& title) {
     HistoryMenuBridge::HistoryItem* item =
         new HistoryMenuBridge::HistoryItem();
     item->title = title;
     item->url = GURL(title);
     return item;
   }
 
   MockTRS::Entries CreateSessionEntries(
-      std::vector<std::unique_ptr<MockTRS::Entry>>* out,
       std::initializer_list<MockTRS::Entry*> entries) {
     MockTRS::Entries ret;
-    out->reserve(out->size() + entries.size());
     for (auto* entry : entries) {

[sky, 2016/08/04 16:34:38]

no {}

       ret.emplace_back(entry);
-      out->emplace_back(entry);
     }
     return ret;
   }
 
   MockTRS::Tab* CreateSessionTab(SessionID::id_type id,
                                  const std::string& url,
                                  const std::string& title) {
     auto tab = new MockTRS::Tab;
     tab->id = id;
     tab->current_navigation_index = 0;
     tab->navigations.push_back(
         sessions::SerializedNavigationEntryTestHelper::CreateNavigation(url,
                                                                         title));
     return tab;
   }
 
   MockTRS::Window* CreateSessionWindow(
       SessionID::id_type id,
       std::initializer_list<MockTRS::Tab*> tabs) {
     auto window = new MockTRS::Window;
     window->id = id;
     window->tabs.reserve(tabs.size());
-    for (auto* tab : tabs) {
-      window->tabs.emplace_back(std::move(*tab));
-      delete tab;
-    }
+    for (auto* tab : tabs)
+      window->tabs.emplace_back(std::move(tab));
     return window;
   }
 
   void GetFaviconForHistoryItem(HistoryMenuBridge::HistoryItem* item) {
     bridge_->GetFaviconForHistoryItem(item);
   }
 
   void GotFaviconData(HistoryMenuBridge::HistoryItem* item,
                       const favicon_base::FaviconImageResult& image_result) {
     bridge_->GotFaviconData(item, image_result);
@@ skipping 90 matching lines @@
   // Confirm tooltips and confirm they are not trimmed (like the item
   // name might be).  Add tolerance for URL fixer-upping;
   // e.g. http://foo becomes http://foo/)
   EXPECT_GE([[[menu itemAtIndex:0] toolTip] length], (2*short_url.length()-5));
   EXPECT_GE([[[menu itemAtIndex:1] toolTip] length], (2*long_url.length()-5));
 }
 
 // Test that the menu is created for a set of simple tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabs) {
   std::unique_ptr<MockTRS> trs(new MockTRS(profile()));
-  std::vector<std::unique_ptr<MockTRS::Entry>> hold_entries;
-  auto entries{CreateSessionEntries(&hold_entries, {
+  auto entries{CreateSessionEntries({
     CreateSessionTab(24, "http://google.com", "Google"),
     CreateSessionTab(42, "http://apple.com", "Apple"),
   })};
 
   using ::testing::ReturnRef;
   EXPECT_CALL(*trs.get(), entries()).WillOnce(ReturnRef(entries));
 
   bridge_->TabRestoreServiceChanged(trs.get());
 
   NSMenu* menu = bridge_->HistoryMenu();
   ASSERT_EQ(2U, [[menu itemArray] count]);
 
   NSMenuItem* item1 = [menu itemAtIndex:0];
   MockBridge::HistoryItem* hist1 = bridge_->HistoryItemForMenuItem(item1);
   EXPECT_TRUE(hist1);
   EXPECT_EQ(24, hist1->session_id);
   EXPECT_NSEQ(@"Google", [item1 title]);
 
   NSMenuItem* item2 = [menu itemAtIndex:1];
   MockBridge::HistoryItem* hist2 = bridge_->HistoryItemForMenuItem(item2);
   EXPECT_TRUE(hist2);
   EXPECT_EQ(42, hist2->session_id);
   EXPECT_NSEQ(@"Apple", [item2 title]);
 }
 
 // Test that the menu is created for a mix of windows and tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
   std::unique_ptr<MockTRS> trs(new MockTRS(profile()));
-  std::vector<std::unique_ptr<MockTRS::Entry>> hold_entries;
-  auto entries{CreateSessionEntries(&hold_entries, {
+  auto entries{CreateSessionEntries({
     CreateSessionTab(24, "http://google.com", "Google"),
     CreateSessionWindow(30, {
       CreateSessionTab(31, "http://foo.com", "foo"),
       CreateSessionTab(32, "http://bar.com", "bar"),
     }),
     CreateSessionTab(42, "http://apple.com", "Apple"),
     CreateSessionWindow(50, {
       CreateSessionTab(51, "http://magic.com", "magic"),
       CreateSessionTab(52, "http://goats.com", "goats"),
       CreateSessionTab(53, "http://teleporter.com", "teleporter"),
@@ skipping 84 matching lines @@
   image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap);
   GotFaviconData(&item, image_result);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace