add enableWebSockets in WebKit API

and remove experimentalWebSocketsEnabled from WebPreferences/Settings.

Patch for http://bugs.webkit.org/show_bug.cgi?id=29896 will remove Settings::experimentalWebSocketsEnabled(), so we need to remove it from WebPreferences too.  This is because such configuration in Settings confuses other WebKit developers and such control is only required for chromium.
Instead add WebKit::enableWebSockets() in this change to
control WebSockets feature.

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

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

1 files changed, 1 insertions, 3 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 26ab756..d4925a0 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1533,7 +1533,6 @@ struct ParamTraits<WebPreferences> {
     WriteParam(m, p.allow_universal_access_from_file_urls);
     WriteParam(m, p.experimental_webgl_enabled);
     WriteParam(m, p.experimental_notifications_enabled);
-    WriteParam(m, p.web_sockets_enabled);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
@@ -1573,8 +1572,7 @@ struct ParamTraits<WebPreferences> {
         ReadParam(m, iter, &p->user_style_sheet_location) &&
         ReadParam(m, iter, &p->allow_universal_access_from_file_urls) &&
         ReadParam(m, iter, &p->experimental_webgl_enabled) &&
-        ReadParam(m, iter, &p->experimental_notifications_enabled) &&
-        ReadParam(m, iter, &p->web_sockets_enabled);
+        ReadParam(m, iter, &p->experimental_notifications_enabled);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<WebPreferences>");