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 "content/shell/shell_url_request_context_getter.h" | 5 #include "content/shell/shell_url_request_context_getter.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/string_split.h" | 8 #include "base/string_split.h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "net/base/cert_verifier.h" | 10 #include "net/base/cert_verifier.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 BrowserThread::GetMessageLoopProxyForThread( | 76 BrowserThread::GetMessageLoopProxyForThread( |
77 BrowserThread::CACHE)); | 77 BrowserThread::CACHE)); |
78 | 78 |
79 net::HttpCache* main_cache = new net::HttpCache( | 79 net::HttpCache* main_cache = new net::HttpCache( |
80 url_request_context_->host_resolver(), | 80 url_request_context_->host_resolver(), |
81 url_request_context_->cert_verifier(), | 81 url_request_context_->cert_verifier(), |
82 url_request_context_->origin_bound_cert_service(), | 82 url_request_context_->origin_bound_cert_service(), |
83 NULL, //tranport_security_state | 83 NULL, //tranport_security_state |
84 NULL, //dns_cert_checker | 84 NULL, //dns_cert_checker |
85 url_request_context_->proxy_service(), | 85 url_request_context_->proxy_service(), |
| 86 "" /* ssl_session_cache_shard */, |
86 url_request_context_->ssl_config_service(), | 87 url_request_context_->ssl_config_service(), |
87 url_request_context_->http_auth_handler_factory(), | 88 url_request_context_->http_auth_handler_factory(), |
88 NULL, // network_delegate | 89 NULL, // network_delegate |
89 url_request_context_->http_server_properties(), | 90 url_request_context_->http_server_properties(), |
90 NULL, | 91 NULL, |
91 main_backend); | 92 main_backend); |
92 storage_->set_http_transaction_factory(main_cache); | 93 storage_->set_http_transaction_factory(main_cache); |
93 | 94 |
94 storage_->set_job_factory(new net::URLRequestJobFactory); | 95 storage_->set_job_factory(new net::URLRequestJobFactory); |
95 } | 96 } |
(...skipping 11 matching lines...) Expand all Loading... |
107 scoped_refptr<base::MessageLoopProxy> | 108 scoped_refptr<base::MessageLoopProxy> |
108 ShellURLRequestContextGetter::GetIOMessageLoopProxy() const { | 109 ShellURLRequestContextGetter::GetIOMessageLoopProxy() const { |
109 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); | 110 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); |
110 } | 111 } |
111 | 112 |
112 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { | 113 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { |
113 return url_request_context_->host_resolver(); | 114 return url_request_context_->host_resolver(); |
114 } | 115 } |
115 | 116 |
116 } // namespace content | 117 } // namespace content |
OLD | NEW |