Add --enable-websocket-over-spdy command-line flag

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 8d3bc3783d4162055e02479e5b6659708cbf636a..ec3618deb276571d577331238cc162cc989a7e60 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -108,6 +108,7 @@
 #include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_throttler_manager.h"
+#include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gl/gl_implementation.h"
@@ -1842,6 +1843,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Start watching all browser threads for responsiveness.
   ThreadWatcherList::StartWatchingAll();
 
+  // Enable WebSocket over SPDY.
+  if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy))
+    net::WebSocketJob::EnableWebSocketOverSpdy(true);
+
   int result_code = ResultCodes::NORMAL_EXIT;
   if (parameters.ui_task) {
     // We are in test mode. Run one task and enter the main message loop.