Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Unified Diff: net/http/http_network_layer.cc

Issue 11416205: Move EnableSpdy from HttpNetworkLayer to IOThread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_layer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_layer.cc
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index b326438d2950b2c2a8f0887cf3ce4b5682a2a720..1acc4c01de3b4be021e07477af6d5affe8365d71 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -38,66 +38,11 @@ HttpTransactionFactory* HttpNetworkLayer::CreateFactory(
}
// static
-void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
- static const char kOff[] = "off";
- static const char kSSL[] = "ssl";
- static const char kDisableSSL[] = "no-ssl";
- static const char kDisablePing[] = "no-ping";
- static const char kExclude[] = "exclude"; // Hosts to exclude
- static const char kDisableCompression[] = "no-compress";
- static const char kDisableAltProtocols[] = "no-alt-protocols";
- static const char kForceAltProtocols[] = "force-alt-protocols";
- static const char kSingleDomain[] = "single-domain";
-
- static const char kInitialMaxConcurrentStreams[] = "init-max-streams";
-
- std::vector<std::string> spdy_options;
- base::SplitString(mode, ',', &spdy_options);
-
- for (std::vector<std::string>::iterator it = spdy_options.begin();
- it != spdy_options.end(); ++it) {
- const std::string& element = *it;
- std::vector<std::string> name_value;
- base::SplitString(element, '=', &name_value);
- const std::string& option = name_value[0];
- const std::string value = name_value.size() > 1 ? name_value[1] : "";
-
- if (option == kOff) {
- HttpStreamFactory::set_spdy_enabled(false);
- } else if (option == kDisableSSL) {
- SpdySession::set_default_protocol(kProtoSPDY2);
- HttpStreamFactory::set_force_spdy_over_ssl(false);
- HttpStreamFactory::set_force_spdy_always(true);
- } else if (option == kSSL) {
- SpdySession::set_default_protocol(kProtoSPDY2);
- HttpStreamFactory::set_force_spdy_over_ssl(true);
- HttpStreamFactory::set_force_spdy_always(true);
- } else if (option == kDisablePing) {
- SpdySession::set_enable_ping_based_connection_checking(false);
- } else if (option == kExclude) {
- HttpStreamFactory::add_forced_spdy_exclusion(value);
- } else if (option == kDisableCompression) {
- BufferedSpdyFramer::set_enable_compression_default(false);
- } else if (option == kDisableAltProtocols) {
- HttpStreamFactory::set_use_alternate_protocols(false);
- } else if (option == kForceAltProtocols) {
- PortAlternateProtocolPair pair;
- pair.port = 443;
- pair.protocol = NPN_SPDY_2;
- HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
- } else if (option == kSingleDomain) {
- SpdySessionPool::ForceSingleDomain();
- LOG(ERROR) << "FORCING SINGLE DOMAIN";
- } else if (option == kInitialMaxConcurrentStreams) {
- int streams;
- if (base::StringToInt(value, &streams) && streams > 0)
- SpdySession::set_init_max_concurrent_streams(streams);
- } else if (option.empty() && it == spdy_options.begin()) {
- continue;
- } else {
- LOG(DFATAL) << "Unrecognized spdy option: " << option;
- }
- }
+void HttpNetworkLayer::ForceAlternateProtocol() {
+ PortAlternateProtocolPair pair;
+ pair.port = 443;
+ pair.protocol = NPN_SPDY_2;
+ HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
}
//-----------------------------------------------------------------------------
« no previous file with comments | « net/http/http_network_layer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698