Turn on session storage by default.

TEST=none
BUG=4360

Review URL: http://codereview.chromium.org/551098

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

5 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 16f4ce7..8b8a66d 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -48,7 +48,6 @@ class DOMStorageTest : public UILayoutTest {
 
   virtual void SetUp() {
     launch_arguments_.AppendSwitch(switches::kDisablePopupBlocking);
-    launch_arguments_.AppendSwitch(switches::kEnableSessionStorage);
     UILayoutTest::SetUp();
   }
 
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 2ea6175..73148c8 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -534,7 +534,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableDesktopNotifications,
     switches::kDisableWebSockets,
     switches::kDisableLocalStorage,
-    switches::kEnableSessionStorage,
+    switches::kDisableSessionStorage,
     switches::kDisableSharedWorkers,
     switches::kDisableApplicationCache,
     switches::kEnableIndexedDatabase,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6ad3fb0..bd1e5e2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -146,6 +146,9 @@ const char kDisablePromptOnRepost[]         = "disable-prompt-on-repost";
 // this option is specified or not.
 const char kDisableRemoteFonts[]            = "disable-remote-fonts";
 
+// Disable session storage.
+const char kDisableSessionStorage[]         = "disable-session-storage";
+
 // Enable shared workers. Functionality not yet complete.
 const char kDisableSharedWorkers[]          = "disable-shared-workers";
 
@@ -266,9 +269,6 @@ const char kEnableRendererAccessibility[]   = "enable-renderer-accessibility";
 // Enable the seccomp sandbox (Linux only)
 const char kEnableSeccompSandbox[]          = "enable-seccomp-sandbox";
 
-// Enable session storage.  Still buggy.
-const char kEnableSessionStorage[]          = "enable-session-storage";
-
 // Enables StatsTable, logging statistics to a global named shared memory table.
 const char kEnableStatsTable[]              = "enable-stats-table";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index aa5c1bd..60bcf3e 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -56,6 +56,7 @@ extern const char kDisablePlugins[];
 extern const char kDisablePopupBlocking[];
 extern const char kDisablePromptOnRepost[];
 extern const char kDisableRemoteFonts[];
+extern const char kDisableSessionStorage[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
 extern const char kDisableSync[];
@@ -93,7 +94,6 @@ extern const char kEnableNaClOnMac[];
 extern const char kEnablePrivacyBlacklists[];
 extern const char kEnableRendererAccessibility[];
 extern const char kEnableSeccompSandbox[];
-extern const char kEnableSessionStorage[];
 extern const char kEnableStatsTable[];
 extern const char kEnableSync[];
 extern const char kEnableSyncBookmarks[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 26f4508..577ba9b 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -761,7 +761,7 @@ void RenderThread::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableLocalStorage(
       !command_line.HasSwitch(switches::kDisableLocalStorage));
   WebRuntimeFeatures::enableSessionStorage(
-      command_line.HasSwitch(switches::kEnableSessionStorage));
+      !command_line.HasSwitch(switches::kDisableSessionStorage));
 
   WebRuntimeFeatures::enableIndexedDatabase(
       command_line.HasSwitch(switches::kEnableIndexedDatabase));