Restore sessionStorage when chrome restarts.

chrome/browser/sessions/session_restore.cc

 // 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/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "content/browser/in_process_webkit/dom_storage_namespace.h"
+#include "content/browser/in_process_webkit/session_storage_namespace.h"
+#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 350 matching lines @@
         base::Histogram::FactoryTimeGet(
             time_for_count,
             base::TimeDelta::FromMilliseconds(10),
             base::TimeDelta::FromSeconds(100),
             100,
             base::Histogram::kUmaTargetedHistogramFlag);
     counter_for_count->AddTime(time_to_load);
   }
 }
 
+void RestoreSessionStorage(WebKitContext* webkit_context,
+                           int64 namespace_id,
+                           const FilePath& session_storage_directory) {
+  webkit_context->dom_storage_context()->RecreateSessionStorageNamespace(
+      namespace_id, session_storage_directory);
+}
+
 // SessionRestoreImpl ---------------------------------------------------------
 
 // SessionRestoreImpl is responsible for fetching the set of tabs to create
 // from SessionService. SessionRestoreImpl deletes itself when done.
 
 class SessionRestoreImpl : public content::NotificationObserver {
  public:
   SessionRestoreImpl(Profile* profile,
                      Browser* browser,
                      bool synchronous,
@@ skipping 313 matching lines @@
 
     WebContents* web_contents =
         browser->AddRestoredTab(tab.navigations,
                                 tab_index,
                                 selected_index,
                                 tab.extension_app_id,
                                 false,
                                 tab.pinned,
                                 true,
                                 NULL);
+    int64 namespace_id =
+        web_contents->GetController().GetSessionStorageNamespace()->id();
+
+    content::BrowserThread::PostTask(
+        content::BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
+        base::Bind(&RestoreSessionStorage,
+                   make_scoped_refptr(
+                       web_contents->GetBrowserContext()->GetWebKitContext()),
+                   namespace_id, tab.session_storage_directory));
+
     if (schedule_load)
       tab_loader_->ScheduleLoad(&web_contents->GetController());
   }
 
   Browser* CreateRestoredBrowser(Browser::Type type,
                                  gfx::Rect bounds,
                                  ui::WindowShowState show_state) {
     Browser* browser = new Browser(type, profile_);
     browser->set_override_bounds(bounds);
     browser->set_show_state(show_state);
@@ skipping 155 matching lines @@
   std::vector<GURL> gurls;
   SessionRestoreImpl restorer(profile,
       static_cast<Browser*>(NULL), true, false, true, gurls);
   restorer.RestoreForeignTab(tab);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }