Enable WebSockets by default

BUG=none
TEST=none

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

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

4 files changed, 6 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 f8292a4..4c2701a3 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -525,7 +525,7 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kInternalNaCl,
     switches::kEnableDatabases,
     switches::kDisableByteRangeSupport,
-    switches::kEnableWebSockets,
+    switches::kDisableWebSockets,
     switches::kEnableLocalStorage,
     switches::kEnableSessionStorage,
     switches::kEnableDesktopNotifications,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 121feba..86e9467 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -130,6 +130,9 @@ const char kDisableWebResources[]           = "disable-web-resources";
 // Don't enforce the same-origin policy.  (Used by people testing their sites.)
 const char kDisableWebSecurity[]            = "disable-web-security";
 
+// Disable Web Sockets support.
+const char kDisableWebSockets[]             = "disable-web-sockets";
+
 // Disable WebKit's XSSAuditor.  The XSSAuditor mitigates reflective XSS.
 const char kDisableXSSAuditor[]             = "disable-xss-auditor";
 
@@ -233,9 +236,6 @@ const char kEnableUserScripts[]             = "enable-user-scripts";
 // Order of the listed sub-arguments does not matter.
 const char kEnableWatchdog[]                = "enable-watchdog";
 
-// Enable Web Sockets support.
-const char kEnableWebSockets[] = "enable-web-sockets";
-
 // Enables experimental features for Spellchecker. Right now, the first
 // experimental feature is auto spell correct, which corrects words which are
 // misppelled by typing the word with two consecutive letters swapped. The
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 03864e7..89ecf9f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -52,6 +52,7 @@ extern const char kDisablePromptOnRepost[];
 extern const char kDisableSync[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
+extern const char kDisableWebSockets[];
 extern const char kDisableXSSAuditor[];
 extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
@@ -81,7 +82,6 @@ extern const char kEnableTabtastic2[];
 extern const char kEnableUserDataDirProfiles[];
 extern const char kEnableUserScripts[];
 extern const char kEnableWatchdog[];
-extern const char kEnableWebSockets[];
 extern const char kExperimentalSpellcheckerFeatures[];
 extern const char kExplicitlyAllowedPorts[];
 extern const char kExtensionsUpdateFrequency[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 2b95c77..244e61f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -528,7 +528,7 @@ void RenderThread::EnsureWebKitInitialized() {
       RenderProcess::current()->initialized_media_library());
 
   WebRuntimeFeatures::enableSockets(
-      command_line.HasSwitch(switches::kEnableWebSockets));
+      !command_line.HasSwitch(switches::kDisableWebSockets));
 
   WebRuntimeFeatures::enableDatabase(
       command_line.HasSwitch(switches::kEnableDatabases));