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

Side by Side Diff: ios/web/shell/shell_url_request_context_getter.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 months 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
« no previous file with comments | « ios/web/public/web_controller_factory.mm ('k') | ios/web/shell/view_controller.mm » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/web/shell/shell_url_request_context_getter.h" 5 #include "ios/web/shell/shell_url_request_context_getter.h"
6 6
7 #include <utility>
8
7 #include "base/base_paths.h" 9 #include "base/base_paths.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 13 #include "base/path_service.h"
12 #include "base/threading/worker_pool.h" 14 #include "base/threading/worker_pool.h"
13 #include "ios/net/cookies/cookie_store_ios.h" 15 #include "ios/net/cookies/cookie_store_ios.h"
14 #include "ios/web/public/web_client.h" 16 #include "ios/web/public/web_client.h"
15 #include "ios/web/public/web_thread.h" 17 #include "ios/web/public/web_thread.h"
16 #include "ios/web/shell/shell_network_delegate.h" 18 #include "ios/web/shell/shell_network_delegate.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 scoped_refptr<net::CookieStoreIOS> cookie_store = 82 scoped_refptr<net::CookieStoreIOS> cookie_store =
81 new net::CookieStoreIOS(persistent_store.get()); 83 new net::CookieStoreIOS(persistent_store.get());
82 storage_->set_cookie_store(cookie_store.get()); 84 storage_->set_cookie_store(cookie_store.get());
83 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get()); 85 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get());
84 86
85 std::string user_agent = web::GetWebClient()->GetUserAgent(false); 87 std::string user_agent = web::GetWebClient()->GetUserAgent(false);
86 storage_->set_http_user_agent_settings(make_scoped_ptr( 88 storage_->set_http_user_agent_settings(make_scoped_ptr(
87 new net::StaticHttpUserAgentSettings("en-us,en", user_agent))); 89 new net::StaticHttpUserAgentSettings("en-us,en", user_agent)));
88 storage_->set_proxy_service( 90 storage_->set_proxy_service(
89 net::ProxyService::CreateUsingSystemProxyResolver( 91 net::ProxyService::CreateUsingSystemProxyResolver(
90 proxy_config_service_.Pass(), 0, url_request_context_->net_log())); 92 std::move(proxy_config_service_), 0,
93 url_request_context_->net_log()));
91 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); 94 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
92 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); 95 storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
93 96
94 storage_->set_transport_security_state( 97 storage_->set_transport_security_state(
95 make_scoped_ptr(new net::TransportSecurityState())); 98 make_scoped_ptr(new net::TransportSecurityState()));
96 transport_security_persister_.reset(new net::TransportSecurityPersister( 99 transport_security_persister_.reset(new net::TransportSecurityPersister(
97 url_request_context_->transport_security_state(), base_path_, 100 url_request_context_->transport_security_state(), base_path_,
98 file_task_runner_, false)); 101 file_task_runner_, false));
99 storage_->set_channel_id_service(make_scoped_ptr( 102 storage_->set_channel_id_service(make_scoped_ptr(
100 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), 103 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
101 base::WorkerPool::GetTaskRunner(true)))); 104 base::WorkerPool::GetTaskRunner(true))));
102 storage_->set_http_server_properties(scoped_ptr<net::HttpServerProperties>( 105 storage_->set_http_server_properties(scoped_ptr<net::HttpServerProperties>(
103 new net::HttpServerPropertiesImpl())); 106 new net::HttpServerPropertiesImpl()));
104 107
105 scoped_ptr<net::HostResolver> host_resolver( 108 scoped_ptr<net::HostResolver> host_resolver(
106 net::HostResolver::CreateDefaultResolver( 109 net::HostResolver::CreateDefaultResolver(
107 url_request_context_->net_log())); 110 url_request_context_->net_log()));
108 storage_->set_http_auth_handler_factory( 111 storage_->set_http_auth_handler_factory(
109 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); 112 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
110 storage_->set_host_resolver(host_resolver.Pass()); 113 storage_->set_host_resolver(std::move(host_resolver));
111 114
112 net::HttpNetworkSession::Params network_session_params; 115 net::HttpNetworkSession::Params network_session_params;
113 network_session_params.cert_verifier = 116 network_session_params.cert_verifier =
114 url_request_context_->cert_verifier(); 117 url_request_context_->cert_verifier();
115 network_session_params.transport_security_state = 118 network_session_params.transport_security_state =
116 url_request_context_->transport_security_state(); 119 url_request_context_->transport_security_state();
117 network_session_params.channel_id_service = 120 network_session_params.channel_id_service =
118 url_request_context_->channel_id_service(); 121 url_request_context_->channel_id_service();
119 network_session_params.net_log = url_request_context_->net_log(); 122 network_session_params.net_log = url_request_context_->net_log();
120 network_session_params.proxy_service = 123 network_session_params.proxy_service =
121 url_request_context_->proxy_service(); 124 url_request_context_->proxy_service();
122 network_session_params.ssl_config_service = 125 network_session_params.ssl_config_service =
123 url_request_context_->ssl_config_service(); 126 url_request_context_->ssl_config_service();
124 network_session_params.http_auth_handler_factory = 127 network_session_params.http_auth_handler_factory =
125 url_request_context_->http_auth_handler_factory(); 128 url_request_context_->http_auth_handler_factory();
126 network_session_params.network_delegate = network_delegate_.get(); 129 network_session_params.network_delegate = network_delegate_.get();
127 network_session_params.http_server_properties = 130 network_session_params.http_server_properties =
128 url_request_context_->http_server_properties(); 131 url_request_context_->http_server_properties();
129 network_session_params.host_resolver = 132 network_session_params.host_resolver =
130 url_request_context_->host_resolver(); 133 url_request_context_->host_resolver();
131 134
132 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); 135 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
133 scoped_ptr<net::HttpCache::DefaultBackend> main_backend( 136 scoped_ptr<net::HttpCache::DefaultBackend> main_backend(
134 new net::HttpCache::DefaultBackend(net::DISK_CACHE, 137 new net::HttpCache::DefaultBackend(net::DISK_CACHE,
135 net::CACHE_BACKEND_DEFAULT, 138 net::CACHE_BACKEND_DEFAULT,
136 cache_path, 0, cache_task_runner_)); 139 cache_path, 0, cache_task_runner_));
137 140
138 storage_->set_http_network_session( 141 storage_->set_http_network_session(
139 make_scoped_ptr(new net::HttpNetworkSession(network_session_params))); 142 make_scoped_ptr(new net::HttpNetworkSession(network_session_params)));
140 storage_->set_http_transaction_factory(make_scoped_ptr( 143 storage_->set_http_transaction_factory(make_scoped_ptr(new net::HttpCache(
141 new net::HttpCache(storage_->http_network_session(), 144 storage_->http_network_session(), std::move(main_backend),
142 main_backend.Pass(), 145 true /* set_up_quic_server_info */)));
143 true /* set_up_quic_server_info */)));
144 146
145 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( 147 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
146 new net::URLRequestJobFactoryImpl()); 148 new net::URLRequestJobFactoryImpl());
147 bool set_protocol = job_factory->SetProtocolHandler( 149 bool set_protocol = job_factory->SetProtocolHandler(
148 "data", make_scoped_ptr(new net::DataProtocolHandler)); 150 "data", make_scoped_ptr(new net::DataProtocolHandler));
149 DCHECK(set_protocol); 151 DCHECK(set_protocol);
150 152
151 storage_->set_job_factory(job_factory.Pass()); 153 storage_->set_job_factory(std::move(job_factory));
152 } 154 }
153 155
154 return url_request_context_.get(); 156 return url_request_context_.get();
155 } 157 }
156 158
157 scoped_refptr<base::SingleThreadTaskRunner> 159 scoped_refptr<base::SingleThreadTaskRunner>
158 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 160 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
159 return network_task_runner_; 161 return network_task_runner_;
160 } 162 }
161 163
162 } // namespace web 164 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/public/web_controller_factory.mm ('k') | ios/web/shell/view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698