diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 22:20:02 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 22:20:02 +0000 |
| commit | 067ce8b0ec3c50dc169de62bfefb245289ba3394 (patch) | |
| tree | 15179eaa37fb3de559233e4a300ec400b9f70917 /chrome | |
| parent | 24c9ee594694a646eec1e5028cdd088cf4d73f9d (diff) | |
| download | chromium_src-067ce8b0ec3c50dc169de62bfefb245289ba3394.zip chromium_src-067ce8b0ec3c50dc169de62bfefb245289ba3394.tar.gz chromium_src-067ce8b0ec3c50dc169de62bfefb245289ba3394.tar.bz2 | |
Get rid of websocket_over_spdy_enabled global.
It's now called enable_websocket_over_spdy and is a member of
HttpNetworkSession::Params.
BUG=372528
Review URL: https://codereview.chromium.org/295383007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/io_thread.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/io_thread.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 055f03c..cef70bc 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -77,7 +77,6 @@ #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/url_request/url_request_throttler_manager.h" -#include "net/websockets/websocket_job.h" #include "url/url_constants.h" #if defined(ENABLE_CONFIGURATION_POLICY) @@ -756,11 +755,6 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { std::string spdy_trial_group = base::FieldTrialList::FindFullName(kSpdyFieldTrialName); - if (command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { - // Enable WebSocket over SPDY. - net::WebSocketJob::set_websocket_over_spdy_enabled(true); - } - if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { globals_->trusted_spdy_proxy.set( command_line.GetSwitchValueASCII(switches::kTrustedSpdyProxy)); @@ -791,6 +785,9 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { globals_->use_alternate_protocols.set(true); } } + + if (command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) + globals_->enable_websocket_over_spdy.set(true); } // TODO(rch): Make the client socket factory a per-network session @@ -965,6 +962,8 @@ void IOThread::InitializeNetworkSessionParams( globals_->forced_spdy_exclusions = params->forced_spdy_exclusions; globals_->use_alternate_protocols.CopyToIfSet( ¶ms->use_alternate_protocols); + globals_->enable_websocket_over_spdy.CopyToIfSet( + ¶ms->enable_websocket_over_spdy); globals_->enable_quic.CopyToIfSet(¶ms->enable_quic); globals_->enable_quic_https.CopyToIfSet(¶ms->enable_quic_https); diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index 8c991b7..9c83a17 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -167,6 +167,7 @@ class IOThread : public content::BrowserThreadDelegate { Optional<bool> force_spdy_always; std::set<net::HostPortPair> forced_spdy_exclusions; Optional<bool> use_alternate_protocols; + Optional<bool> enable_websocket_over_spdy; Optional<bool> enable_quic; Optional<bool> enable_quic_https; |