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

Side by Side Diff: mojo/shell/url_request_context_getter.cc

Issue 59693008: Give mojo_shell a TransportSecurityPersister (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sprinkle some NET_EXPORT Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/shell/url_request_context_getter.h ('k') | net/http/transport_security_persister.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/shell/url_request_context_getter.h" 5 #include "mojo/shell/url_request_context_getter.h"
6 6
7 #include "net/cert/cert_verifier.h" 7 #include "net/cert/cert_verifier.h"
8 #include "net/cookies/cookie_monster.h" 8 #include "net/cookies/cookie_monster.h"
9 #include "net/http/http_cache.h" 9 #include "net/http/http_cache.h"
10 #include "net/http/http_network_session.h" 10 #include "net/http/http_network_session.h"
11 #include "net/http/http_server_properties_impl.h" 11 #include "net/http/http_server_properties_impl.h"
12 #include "net/http/transport_security_state.h" 12 #include "net/http/transport_security_state.h"
13 #include "net/proxy/proxy_service.h" 13 #include "net/proxy/proxy_service.h"
14 #include "net/ssl/default_server_bound_cert_store.h" 14 #include "net/ssl/default_server_bound_cert_store.h"
15 #include "net/ssl/server_bound_cert_service.h" 15 #include "net/ssl/server_bound_cert_service.h"
16 #include "net/ssl/ssl_config_service_defaults.h" 16 #include "net/ssl/ssl_config_service_defaults.h"
17 #include "net/url_request/file_protocol_handler.h" 17 #include "net/url_request/file_protocol_handler.h"
18 #include "net/url_request/static_http_user_agent_settings.h" 18 #include "net/url_request/static_http_user_agent_settings.h"
19 #include "net/url_request/url_request_context.h" 19 #include "net/url_request/url_request_context.h"
20 #include "net/url_request/url_request_job_factory_impl.h" 20 #include "net/url_request/url_request_job_factory_impl.h"
21 21
22 namespace mojo { 22 namespace mojo {
23 namespace shell { 23 namespace shell {
24 24
25 namespace {
26
27 const bool kTransportSecurityPersisterIsReadOnly = false;
28
29 } // namespace
30
25 URLRequestContextGetter::URLRequestContextGetter( 31 URLRequestContextGetter::URLRequestContextGetter(
26 base::FilePath base_path, 32 base::FilePath base_path,
27 base::SingleThreadTaskRunner* network_task_runner, 33 base::SingleThreadTaskRunner* network_task_runner,
28 base::SingleThreadTaskRunner* file_task_runner, 34 base::SingleThreadTaskRunner* file_task_runner,
29 base::MessageLoopProxy* cache_task_runner, 35 base::MessageLoopProxy* cache_task_runner,
30 scoped_ptr<net::NetworkDelegate> network_delegate) 36 scoped_ptr<net::NetworkDelegate> network_delegate)
31 : base_path_(base_path), 37 : base_path_(base_path),
32 file_task_runner_(file_task_runner), 38 file_task_runner_(file_task_runner),
33 network_task_runner_(network_task_runner), 39 network_task_runner_(network_task_runner),
34 cache_task_runner_(cache_task_runner), 40 cache_task_runner_(cache_task_runner),
(...skipping 13 matching lines...) Expand all
48 storage_.reset( 54 storage_.reset(
49 new net::URLRequestContextStorage(url_request_context_.get())); 55 new net::URLRequestContextStorage(url_request_context_.get()));
50 56
51 storage_->set_cookie_store(new net::CookieMonster(NULL, NULL)); 57 storage_->set_cookie_store(new net::CookieMonster(NULL, NULL));
52 storage_->set_http_user_agent_settings( 58 storage_->set_http_user_agent_settings(
53 new net::StaticHttpUserAgentSettings("en-us,en", "Mojo/0.1")); 59 new net::StaticHttpUserAgentSettings("en-us,en", "Mojo/0.1"));
54 60
55 storage_->set_proxy_service(net::ProxyService::CreateDirect()); 61 storage_->set_proxy_service(net::ProxyService::CreateDirect());
56 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); 62 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
57 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); 63 storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
58 storage_->set_transport_security_state(new net::TransportSecurityState()); 64
65 net::TransportSecurityState* transport_security_state =
66 new net::TransportSecurityState();
67 storage_->set_transport_security_state(transport_security_state);
68
69 transport_security_persister_.reset(
70 new net::TransportSecurityPersister(
71 transport_security_state,
72 base_path_,
73 file_task_runner_,
74 kTransportSecurityPersisterIsReadOnly));
75
59 storage_->set_server_bound_cert_service(new net::ServerBoundCertService( 76 storage_->set_server_bound_cert_service(new net::ServerBoundCertService(
60 new net::DefaultServerBoundCertStore(NULL), file_task_runner_)); 77 new net::DefaultServerBoundCertStore(NULL), file_task_runner_));
61 storage_->set_http_server_properties( 78 storage_->set_http_server_properties(
62 scoped_ptr<net::HttpServerProperties>( 79 scoped_ptr<net::HttpServerProperties>(
63 new net::HttpServerPropertiesImpl())); 80 new net::HttpServerPropertiesImpl()));
64 storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver( 81 storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(
65 url_request_context_->net_log())); 82 url_request_context_->net_log()));
66 83
67 net::HttpNetworkSession::Params network_session_params; 84 net::HttpNetworkSession::Params network_session_params;
68 network_session_params.cert_verifier = 85 network_session_params.cert_verifier =
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 return url_request_context_.get(); 124 return url_request_context_.get();
108 } 125 }
109 126
110 scoped_refptr<base::SingleThreadTaskRunner> 127 scoped_refptr<base::SingleThreadTaskRunner>
111 URLRequestContextGetter::GetNetworkTaskRunner() const { 128 URLRequestContextGetter::GetNetworkTaskRunner() const {
112 return network_task_runner_; 129 return network_task_runner_;
113 } 130 }
114 131
115 } // namespace shell 132 } // namespace shell
116 } // namespace mojo 133 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/url_request_context_getter.h ('k') | net/http/transport_security_persister.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698