Abstract content::SessionStorageNamespace from core TabRestore code

chrome/browser/sessions/tab_restore_service.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/sessions/core/tab_restore_service_client.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "components/sessions/session_id.h"
 #include "components/sessions/session_types.h"
-#include "content/public/browser/session_storage_namespace.h"
 #include "ui/base/window_open_disposition.h"
 
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 
 namespace content {
-class SessionStorageNamespace;
 class WebContents;
 }
 
 // TabRestoreService is responsible for maintaining the most recently closed
 // tabs and windows. When a tab is closed
 // TabRestoreService::CreateHistoricalTab is invoked and a Tab is created to
 // represent the tab. Similarly, when a browser is closed, BrowserClosing is
 // invoked and a Window is created to represent the window.
 //
 // To restore a tab/window from the TabRestoreService invoke RestoreEntryById
@@ skipping 56 matching lines @@
 
     // Index within the tab strip. May be -1 for an unknown index.
     int tabstrip_index;
 
     // True if the tab was pinned.
     bool pinned;
 
     // If non-empty gives the id of the extension for the tab.
     std::string extension_app_id;
 
-    // The associated session storage namespace (if any).
-    scoped_refptr<content::SessionStorageNamespace> session_storage_namespace;
+    // The associated client data.
+    scoped_refptr<sessions::TabClientData> client_data;
 
     // The user agent override used for the tab's navigations (if applicable).
     std::string user_agent_override;
   };
 
   // Represents a previously open window.
   struct Window : public Entry {
     Window();
     ~Window() override;
 
@@ skipping 70 matching lines @@
   virtual void LoadTabsFromLastSession() = 0;
 
   // Returns true if the tab entries have been loaded.
   virtual bool IsLoaded() const = 0;
 
   // Deletes the last session.
   virtual void DeleteLastSession() = 0;
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_