Switch over to the new way of enabling/disabling session/local storage.

BUG=none 
TEST=|'localStorage' in window| should only be true iff --enable-local-storage is specified 
Review URL: http://codereview.chromium.org/335034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31082 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 10 insertions, 16 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 7869759..f8292a4 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -289,8 +289,10 @@ bool BrowserRenderProcessHost::Init(bool is_extensions_process) {
   CommandLine cmd_line(renderer_path);
   cmd_line.AppendSwitchWithValue(switches::kProcessChannelID,
                                  ASCIIToWide(channel_id));
-  if (is_extensions_process)
+  if (is_extensions_process) {
     cmd_line.AppendSwitch(switches::kEnableDatabases);
+    cmd_line.AppendSwitch(switches::kEnableLocalStorage);
+  }
   bool has_cmd_prefix;
   AppendRendererCommandLine(&cmd_line, &has_cmd_prefix);
 
@@ -524,6 +526,8 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kEnableDatabases,
     switches::kDisableByteRangeSupport,
     switches::kEnableWebSockets,
+    switches::kEnableLocalStorage,
+    switches::kEnableSessionStorage,
     switches::kEnableDesktopNotifications,
     // We propagate the Chrome Frame command line here as well in case the
     // renderer is not run in the sandbox.
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 7dc7c2a..d6545a8 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -183,8 +183,6 @@ 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);
   }
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index e226cb3..3409a3d 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1615,7 +1615,6 @@ 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);
@@ -1654,7 +1653,6 @@ 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 0805000..2b95c77 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -538,6 +538,11 @@ void RenderThread::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableNotifications(
       command_line.HasSwitch(switches::kEnableDesktopNotifications));
 #endif
+
+  WebRuntimeFeatures::enableLocalStorage(
+      command_line.HasSwitch(switches::kEnableLocalStorage));
+  WebRuntimeFeatures::enableSessionStorage(
+      command_line.HasSwitch(switches::kEnableSessionStorage));
 }
 
 void RenderThread::IdleHandler() {
diff --git a/webkit/api/public/WebSettings.h b/webkit/api/public/WebSettings.h
index 40e10f6..30685aa 100644
--- a/webkit/api/public/WebSettings.h
+++ b/webkit/api/public/WebSettings.h
@@ -71,7 +71,6 @@ namespace WebKit {
         virtual void setDownloadableBinaryFontsEnabled(bool) = 0;
         virtual void setXSSAuditorEnabled(bool) = 0;
         virtual void setLocalStorageEnabled(bool) = 0;
-        virtual void setSessionStorageEnabled(bool) = 0;
         virtual void setEditableLinkBehaviorNeverLive() = 0;
         virtual void setFontRenderingModeNormal() = 0;
         virtual void setShouldPaintCustomScrollbars(bool) = 0;
diff --git a/webkit/api/src/WebSettingsImpl.cpp b/webkit/api/src/WebSettingsImpl.cpp
index 8c52ce0..cc5c567 100644
--- a/webkit/api/src/WebSettingsImpl.cpp
+++ b/webkit/api/src/WebSettingsImpl.cpp
@@ -195,11 +195,6 @@ void WebSettingsImpl::setLocalStorageEnabled(bool enabled)
     m_settings->setLocalStorageEnabled(enabled);
 }
 
-void WebSettingsImpl::setSessionStorageEnabled(bool enabled)
-{
-    m_settings->setSessionStorageEnabled(enabled);
-}
-
 void WebSettingsImpl::setEditableLinkBehaviorNeverLive()
 {
     // FIXME: If you ever need more behaviors than this, then we should probably
diff --git a/webkit/api/src/WebSettingsImpl.h b/webkit/api/src/WebSettingsImpl.h
index 62eae9c..f9e1f49 100644
--- a/webkit/api/src/WebSettingsImpl.h
+++ b/webkit/api/src/WebSettingsImpl.h
@@ -73,7 +73,6 @@ namespace WebKit {
         virtual void setDownloadableBinaryFontsEnabled(bool);
         virtual void setXSSAuditorEnabled(bool);
         virtual void setLocalStorageEnabled(bool);
-        virtual void setSessionStorageEnabled(bool);
         virtual void setEditableLinkBehaviorNeverLive();
         virtual void setFontRenderingModeNormal();
         virtual void setShouldPaintCustomScrollbars(bool);
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 758ac81..cfbfa13 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -54,7 +54,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setLocalStorageEnabled(local_storage_enabled);
   settings->setDatabasesEnabled(
       WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled);
-  settings->setSessionStorageEnabled(session_storage_enabled);
   settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
 
   // This setting affects the behavior of links in an editable region:
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index cad5b5d..5d23cb6 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -48,7 +48,6 @@ struct WebPreferences {
   bool xss_auditor_enabled;
   bool local_storage_enabled;
   bool databases_enabled;
-  bool session_storage_enabled;
   bool application_cache_enabled;
   bool tabs_to_links;
 
@@ -93,7 +92,6 @@ struct WebPreferences {
         xss_auditor_enabled(false),
         local_storage_enabled(false),
         databases_enabled(false),
-        session_storage_enabled(false),
         application_cache_enabled(false),
         tabs_to_links(true),
         user_style_sheet_enabled(false),
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 2bfd69f..9c78b5f 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -424,7 +424,6 @@ void TestShell::ResetWebPreferences() {
         // lose the coverage of dynamic font tests in webkit test.
         web_prefs_->remote_fonts_enabled = true;
         web_prefs_->local_storage_enabled = true;
-        web_prefs_->session_storage_enabled = true;
         web_prefs_->application_cache_enabled = true;
         web_prefs_->databases_enabled = true;
         // LayoutTests were written with Safari Mac in mind which does not allow