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

components/sessions/content/content_live_tab.cc

 // Copyright 2015 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 "components/sessions/content/content_live_tab.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/sessions/content/content_platform_specific_tab_data.h"
 
 namespace {
@@ skipping 40 matching lines @@
   return sessions::ContentSerializedNavigationBuilder::FromNavigationEntry(
       GetPendingEntryIndex(), *navigation_controller().GetPendingEntry());
 }
 
 int ContentLiveTab::GetEntryCount() {
   return navigation_controller().GetEntryCount();
 }
 
 std::unique_ptr<sessions::PlatformSpecificTabData>
 ContentLiveTab::GetPlatformSpecificTabData() {
-  return base::WrapUnique(
-      new sessions::ContentPlatformSpecificTabData(web_contents()));
+  return base::MakeUnique<sessions::ContentPlatformSpecificTabData>(
+      web_contents());
 }
 
 void ContentLiveTab::LoadIfNecessary() {
   navigation_controller().LoadIfNecessary();
 }
 
 const std::string& ContentLiveTab::GetUserAgentOverride() const {
   return web_contents()->GetUserAgentOverride();
 }
 
 }  // namespace sessions