Revert 31999 - Enable HTML5 DBs by default (except in incognito mode).

TEST=none
BUG=none


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

TBR=michael@chromium.org

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

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

2 files changed, 16 insertions, 6 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 0837847..200fecf 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -315,6 +315,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)
+    cmd_line.AppendSwitch(switches::kEnableDatabases);
   bool has_cmd_prefix;
   AppendRendererCommandLine(&cmd_line, &has_cmd_prefix);
 
@@ -558,7 +560,6 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kDisableDesktopNotifications,
     switches::kDisableWebSockets,
     switches::kDisableLocalStorage,
-    switches::kDisableDatabases,
     switches::kEnableSessionStorage,
     switches::kDisableSharedWorkers,
     switches::kEnableApplicationCache,
@@ -571,6 +572,12 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
 #endif
   };
 
+  // Propagate the following switches to the renderer command line (along
+  // with any associated values) only if we're not in incognito mode.
+  static const char* const not_otr_switch_names[] = {
+    switches::kEnableDatabases,
+  };
+
   for (size_t i = 0; i < arraysize(switch_names); ++i) {
     if (browser_cmd.HasSwitch(switch_names[i])) {
       renderer_cmd->AppendSwitchWithValue(switch_names[i],
@@ -578,10 +585,13 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     }
   }
 
-  // Disable databases in incognito mode.
-  if (profile()->IsOffTheRecord() &&
-      !browser_cmd.HasSwitch(switches::kDisableDatabases)) {
-    renderer_cmd->AppendSwitch(switches::kDisableDatabases);
+  if (!profile()->IsOffTheRecord()) {
+    for (size_t i = 0; i < arraysize(not_otr_switch_names); ++i) {
+      if (browser_cmd.HasSwitch(not_otr_switch_names[i])) {
+        renderer_cmd->AppendSwitchWithValue(not_otr_switch_names[i],
+            browser_cmd.GetSwitchValueASCII(not_otr_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 b57175c..3827a45 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -182,7 +182,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.local_storage_enabled =
       !command_line.HasSwitch(switches::kDisableLocalStorage);
     web_prefs.databases_enabled =
-      !command_line.HasSwitch(switches::kDisableDatabases);
+      command_line.HasSwitch(switches::kEnableDatabases);
     web_prefs.experimental_webgl_enabled =
       command_line.HasSwitch(switches::kEnableExperimentalWebGL);
   }