Force databases and localstorage to be enabled extensions.

chrome/browser/tab_contents/render_view_host_delegate_helper.cc

Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc
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 5146cafa3324861485d28e0d058ab94a0e671cb9..184fc5e65e08d3c2aadafb135ab5b55658df1a6d 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -179,12 +179,10 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.application_cache_enabled =
         command_line.HasSwitch(switches::kEnableApplicationCache);
 
-    // NOTE: We imply local storage enabledness for extensions because the
-    // extensions team is beta testing local storage and we like to live on the
-    // edge.
     web_prefs.local_storage_enabled =
-      command_line.HasSwitch(switches::kEnableLocalStorage) ||
-      command_line.HasSwitch(switches::kEnableExtensions);
+      command_line.HasSwitch(switches::kEnableLocalStorage);
+    web_prefs.databases_enabled =
+      command_line.HasSwitch(switches::kEnableDatabases);
     web_prefs.session_storage_enabled =
       command_line.HasSwitch(switches::kEnableSessionStorage);
   }