Abstract content::SessionStorageNamespace from core TabRestore code

chrome/browser/sessions/tab_restore_service.cc

Index: chrome/browser/sessions/tab_restore_service.cc
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 06a494a2ce0d41940659bebcc22ef80561be7dfd..7728efa07421e574d6e825553135577e1d23bc76 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/sessions/tab_restore_service.h"
 
-#include "content/public/browser/session_storage_namespace.h"
-
 // TimeFactory-----------------------------------------------------------------
 
 TabRestoreService::TimeFactory::~TimeFactory() {}
@@ -37,9 +35,38 @@ TabRestoreService::Tab::Tab()
       pinned(false) {
 }
 
+TabRestoreService::Tab::Tab(const TabRestoreService::Tab& tab)
+    : Entry(TAB),
+      navigations(tab.navigations),
+      current_navigation_index(tab.current_navigation_index),
+      browser_id(tab.browser_id),
+      tabstrip_index(tab.tabstrip_index),
+      pinned(tab.pinned),
+      extension_app_id(tab.extension_app_id),
+      user_agent_override(tab.user_agent_override) {
+  if (tab.client_data)
+    client_data = tab.client_data->Clone();
+}
+
 TabRestoreService::Tab::~Tab() {
 }
 
+TabRestoreService::Tab& TabRestoreService::Tab::operator=(
+    const TabRestoreService::Tab& tab) {
+  navigations = tab.navigations;
+  current_navigation_index = tab.current_navigation_index;
+  browser_id = tab.browser_id;
+  tabstrip_index = tab.tabstrip_index;
+  pinned = tab.pinned;
+  extension_app_id = tab.extension_app_id;
+  user_agent_override = tab.user_agent_override;
+
+  if (tab.client_data)
+    client_data = tab.client_data->Clone();
+
+  return *this;
+}
+
 // Window ---------------------------------------------------------------------
 
 TabRestoreService::Window::Window() : Entry(WINDOW), selected_tab_index(-1) {