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

chrome/browser/extensions/api/sessions/sessions_api.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 18 matching lines @@
 
 class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction {
  protected:
   ~SessionsGetRecentlyClosedFunction() override {}
   bool RunSync() override;
   DECLARE_EXTENSION_FUNCTION("sessions.getRecentlyClosed",
                              SESSIONS_GETRECENTLYCLOSED)
 
  private:
   api::tabs::Tab CreateTabModel(const sessions::TabRestoreService::Tab& tab,
-                                int session_id,
-                                int selected_index);
+                                bool active);
   std::unique_ptr<api::windows::Window> CreateWindowModel(
-      const sessions::TabRestoreService::Window& window,
-      int session_id);
+      const sessions::TabRestoreService::Window& window);
   std::unique_ptr<api::sessions::Session> CreateSessionModel(
-      const sessions::TabRestoreService::Entry* entry);
+      const sessions::TabRestoreService::Entry& entry);
 };
 
 class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction {
  protected:
   ~SessionsGetDevicesFunction() override {}
   bool RunSync() override;
   DECLARE_EXTENSION_FUNCTION("sessions.getDevices", SESSIONS_GETDEVICES)
 
  private:
   api::tabs::Tab CreateTabModel(const std::string& session_tag,
                                 const sessions::SessionTab& tab,
                                 int tab_index,
-                                int selected_index);
+                                bool active);
   std::unique_ptr<api::windows::Window> CreateWindowModel(
       const sessions::SessionWindow& window,
       const std::string& session_tag);
   std::unique_ptr<api::sessions::Session> CreateSessionModel(
       const sessions::SessionWindow& window,
       const std::string& session_tag);
   api::sessions::Device CreateDeviceModel(
       const sync_driver::SyncedSession* session);
 };
 
@@ skipping 65 matching lines @@
 
   // Created lazily upon OnListenerAdded.
   std::unique_ptr<SessionsEventRouter> sessions_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionsAPI);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__