summaryrefslogtreecommitdiffstats
path: root/net/tools
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 /net/tools
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 'net/tools')
-rw-r--r--net/tools/fetch/fetch_client.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 7c1b0f3..fc22bdc 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -22,6 +22,7 @@
#include "net/http/http_network_layer.h"
#include "net/http/http_network_session.h"
#include "net/http/http_request_info.h"
+#include "net/http/http_server_properties_impl.h"
#include "net/http/http_transaction.h"
#include "net/proxy/proxy_service.h"
@@ -150,12 +151,14 @@ int main(int argc, char** argv) {
net::HttpTransactionFactory* factory = NULL;
scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
+ net::HttpServerPropertiesImpl http_server_properties;
net::HttpNetworkSession::Params session_params;
session_params.host_resolver = host_resolver.get();
session_params.cert_verifier = cert_verifier.get();
session_params.proxy_service = proxy_service.get();
session_params.http_auth_handler_factory = http_auth_handler_factory.get();
+ session_params.http_server_properties = &http_server_properties;
session_params.ssl_config_service = ssl_config_service;
scoped_refptr<net::HttpNetworkSession> network_session(