4 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 0c2a7b0..7831ab5 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -523,8 +523,6 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kEnableDatabases,
     switches::kDisableByteRangeSupport,
     switches::kEnableWebSockets,
-    switches::kEnableLocalStorage,
-    switches::kEnableSessionStorage,
   };
 
   for (size_t i = 0; i < arraysize(switch_names); ++i) {
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index b46e392..a0b0c41 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -183,6 +183,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
       command_line.HasSwitch(switches::kEnableLocalStorage);
     web_prefs.databases_enabled =
       command_line.HasSwitch(switches::kEnableDatabases);
+    web_prefs.session_storage_enabled =
+      command_line.HasSwitch(switches::kEnableSessionStorage);
     web_prefs.experimental_webgl_enabled =
       command_line.HasSwitch(switches::kEnableExperimentalWebGL);
     web_prefs.experimental_notifications_enabled =
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index be090f3..0ef796c 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1518,6 +1518,7 @@ struct ParamTraits<WebPreferences> {
     WriteParam(m, p.xss_auditor_enabled);
     WriteParam(m, p.local_storage_enabled);
     WriteParam(m, p.databases_enabled);
+    WriteParam(m, p.session_storage_enabled);
     WriteParam(m, p.application_cache_enabled);
     WriteParam(m, p.tabs_to_links);
     WriteParam(m, p.user_style_sheet_enabled);
@@ -1557,6 +1558,7 @@ struct ParamTraits<WebPreferences> {
         ReadParam(m, iter, &p->xss_auditor_enabled) &&
         ReadParam(m, iter, &p->local_storage_enabled) &&
         ReadParam(m, iter, &p->databases_enabled) &&
+        ReadParam(m, iter, &p->session_storage_enabled) &&
         ReadParam(m, iter, &p->application_cache_enabled) &&
         ReadParam(m, iter, &p->tabs_to_links) &&
         ReadParam(m, iter, &p->user_style_sheet_enabled) &&
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index f1a528c..3ccdd85 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -500,11 +500,6 @@ void RenderThread::EnsureWebKitInitialized() {
 
   if (command_line.HasSwitch(switches::kEnableWebSockets))
     WebKit::enableWebSockets();
-
-  WebKit::setLocalStorageEnabled(
-      command_line.HasSwitch(switches::kEnableLocalStorage));
-  WebKit::setSessionStorageEnabled(
-      command_line.HasSwitch(switches::kEnableSessionStorage));
 }
 
 void RenderThread::IdleHandler() {