Index: chrome/browser/browser_main.cc |
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc |
index 8d3bc3783d4162055e02479e5b6659708cbf636a..3b5414f0b1453b26a4119a698122763ea81a8922 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" |
@@ -1402,6 +1403,12 @@ int BrowserMain(const MainFunctionParams& parameters) { |
about_flags::ConvertFlagsToSwitches(local_state, |
CommandLine::ForCurrentProcess()); |
+ // Enable WebSocket over SPDY. |
+ // It shluld be set up in InitializeNetworkOptions, but we could not handle |
Yuta Kitamura
2011/05/20 08:30:33
shluld -> should
Takashi Toyoshima
2011/05/20 09:46:52
This comment is changed for former relocation.
|
+ // about:flags there. So We set it up here for the future labs switch. |
Yuta Kitamura
2011/05/20 08:30:33
We -> we
Takashi Toyoshima
2011/05/20 09:46:52
ditto.
|
+ if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) |
+ net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
+ |
// Now the command line has been mutated based on about:flags, we can |
// set up metrics and initialize field trials. |
MetricsService* metrics = parts->SetupMetricsAndFieldTrials( |