OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/tools/test_shell/test_shell_request_context.h" | 5 #include "webkit/tools/test_shell/test_shell_request_context.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 storage_.set_http_server_properties( | 88 storage_.set_http_server_properties( |
89 new net::HttpServerPropertiesImpl); | 89 new net::HttpServerPropertiesImpl); |
90 | 90 |
91 net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend( | 91 net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend( |
92 cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, | 92 cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, |
93 cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread()); | 93 cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread()); |
94 | 94 |
95 net::HttpCache* cache = | 95 net::HttpCache* cache = |
96 new net::HttpCache(host_resolver(), cert_verifier(), | 96 new net::HttpCache(host_resolver(), cert_verifier(), |
97 origin_bound_cert_service(), NULL, NULL, | 97 origin_bound_cert_service(), NULL, NULL, |
98 proxy_service(), ssl_config_service(), | 98 proxy_service(), |
| 99 "" /* ssl_session_cache_shard */, |
| 100 ssl_config_service(), |
99 http_auth_handler_factory(), NULL, | 101 http_auth_handler_factory(), NULL, |
100 http_server_properties(), NULL, | 102 http_server_properties(), NULL, |
101 backend); | 103 backend); |
102 | 104 |
103 cache->set_mode(cache_mode); | 105 cache->set_mode(cache_mode); |
104 storage_.set_http_transaction_factory(cache); | 106 storage_.set_http_transaction_factory(cache); |
105 | 107 |
106 storage_.set_ftp_transaction_factory( | 108 storage_.set_ftp_transaction_factory( |
107 new net::FtpNetworkLayer(host_resolver())); | 109 new net::FtpNetworkLayer(host_resolver())); |
108 | 110 |
(...skipping 15 matching lines...) Expand all Loading... |
124 storage_.set_job_factory(job_factory); | 126 storage_.set_job_factory(job_factory); |
125 } | 127 } |
126 | 128 |
127 TestShellRequestContext::~TestShellRequestContext() { | 129 TestShellRequestContext::~TestShellRequestContext() { |
128 } | 130 } |
129 | 131 |
130 const std::string& TestShellRequestContext::GetUserAgent( | 132 const std::string& TestShellRequestContext::GetUserAgent( |
131 const GURL& url) const { | 133 const GURL& url) const { |
132 return webkit_glue::GetUserAgent(url); | 134 return webkit_glue::GetUserAgent(url); |
133 } | 135 } |
OLD | NEW |