Turn LocalStorage on by default.

TEST=none
BUG=4360

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

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

6 files changed, 7 insertions, 10 deletions

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 2ea3f5d..7f25f5c 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -59,7 +59,6 @@ class DOMStorageTest : public UILayoutTest {
 
   virtual void SetUp() {
     launch_arguments_.AppendSwitch(switches::kDisablePopupBlocking);
-    launch_arguments_.AppendSwitch(switches::kEnableLocalStorage);
     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 748f6fd..91c692f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -307,10 +307,8 @@ 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);
 
@@ -552,7 +550,7 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kEnableDatabases,
     switches::kDisableByteRangeSupport,
     switches::kDisableWebSockets,
-    switches::kEnableLocalStorage,
+    switches::kDisableLocalStorage,
     switches::kEnableSessionStorage,
     switches::kEnableSharedWorkers,
     switches::kEnableDesktopNotifications,
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 d6545a8..3827a45 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -180,7 +180,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
         command_line.HasSwitch(switches::kEnableApplicationCache);
 
     web_prefs.local_storage_enabled =
-      command_line.HasSwitch(switches::kEnableLocalStorage);
+      !command_line.HasSwitch(switches::kDisableLocalStorage);
     web_prefs.databases_enabled =
       command_line.HasSwitch(switches::kEnableDatabases);
     web_prefs.experimental_webgl_enabled =
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 31e93fd..ef26499 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -188,8 +188,8 @@ const char kEnableFastback[]                = "enable-fastback";
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
-// Enable local storage.  Still buggy.
-const char kEnableLocalStorage[]            = "enable-local-storage";
+// Disable LocalStorage.
+const char kDisableLocalStorage[]            = "disable-local-storage";
 
 // Force logging to be enabled.  Logging is disabled by default in release
 // builds.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index bde8c92..4174564 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -69,7 +69,7 @@ extern const char kEnableExperimentalWebGL[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableLocalStorage[];
+extern const char kDisableLocalStorage[];
 extern const char kEnableLogging[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableNativeWebWorkers[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index e22e310..a2a177e 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -560,7 +560,7 @@ void RenderThread::EnsureWebKitInitialized() {
 #endif
 
   WebRuntimeFeatures::enableLocalStorage(
-      command_line.HasSwitch(switches::kEnableLocalStorage));
+      !command_line.HasSwitch(switches::kDisableLocalStorage));
   WebRuntimeFeatures::enableSessionStorage(
       command_line.HasSwitch(switches::kEnableSessionStorage));
 }