| Index: chrome/browser/browser_main.cc
|
| diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
|
| index 06ad5f593ce34459b3965e9bdde0e4d2df41acde..ea374ed23417e09b093da93cca1a8768867d044e 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"
|
| @@ -725,6 +726,11 @@ void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
|
| true);
|
|
|
| SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker);
|
| +
|
| + if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) {
|
| + // Enable WebSocket over SPDY.
|
| + net::WebSocketJob::set_websocket_over_spdy_enabled(true);
|
| + }
|
| }
|
|
|
| // Creates key child threads. We need to do this explicitly since
|
|
|