summaryrefslogtreecommitdiffstats
path: root/chrome/service/net
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-10 07:32:53 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-10 07:32:53 +0000
commit17291a02bb3589d94ceb63fbb14ca59fff75e163 (patch)
treedff2d5c6919d567ced7dcbfeea6c8daa580b0673 /chrome/service/net
parentcd6e0ba8e0d9435222349ff4d4d7b19d137d9c57 (diff)
downloadchromium_src-17291a02bb3589d94ceb63fbb14ca59fff75e163.zip
chromium_src-17291a02bb3589d94ceb63fbb14ca59fff75e163.tar.gz
chromium_src-17291a02bb3589d94ceb63fbb14ca59fff75e163.tar.bz2
Migrate HttpAlternateProtocols to HttpServerPropertiesImpl.
Hooks in HttpServerPropertiesManager also. No persistence done yet. This is all plumbing. Also require HttpServerProperties in HttpNetworkSession::Params. BUG=98472 TEST=none Review URL: http://codereview.chromium.org/8211003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/net')
-rw-r--r--chrome/service/net/service_url_request_context.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 5159078..d91f400 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -23,6 +23,7 @@
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"
#include "net/http/http_network_session.h"
+#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_service.h"
@@ -122,6 +123,7 @@ ServiceURLRequestContext::ServiceURLRequestContext(
storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
storage_.set_http_auth_handler_factory(
net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
+ storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
net::HttpNetworkSession::Params session_params;
session_params.host_resolver = host_resolver();
@@ -130,6 +132,7 @@ ServiceURLRequestContext::ServiceURLRequestContext(
session_params.proxy_service = proxy_service();
session_params.ssl_config_service = ssl_config_service();
session_params.http_auth_handler_factory = http_auth_handler_factory();
+ session_params.http_server_properties = http_server_properties();
scoped_refptr<net::HttpNetworkSession> network_session(
new net::HttpNetworkSession(session_params));
storage_.set_http_transaction_factory(