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

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

Issue 1811283004: Remove NetworkDelegate from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to comments Created 4 years, 9 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/crnet/crnet_environment.mm ('k') | jingle/glue/proxy_resolving_client_socket.cc » ('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> 7 #include <utility>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 url_request_context_->transport_security_state(); 117 url_request_context_->transport_security_state();
118 network_session_params.channel_id_service = 118 network_session_params.channel_id_service =
119 url_request_context_->channel_id_service(); 119 url_request_context_->channel_id_service();
120 network_session_params.net_log = url_request_context_->net_log(); 120 network_session_params.net_log = url_request_context_->net_log();
121 network_session_params.proxy_service = 121 network_session_params.proxy_service =
122 url_request_context_->proxy_service(); 122 url_request_context_->proxy_service();
123 network_session_params.ssl_config_service = 123 network_session_params.ssl_config_service =
124 url_request_context_->ssl_config_service(); 124 url_request_context_->ssl_config_service();
125 network_session_params.http_auth_handler_factory = 125 network_session_params.http_auth_handler_factory =
126 url_request_context_->http_auth_handler_factory(); 126 url_request_context_->http_auth_handler_factory();
127 network_session_params.network_delegate = network_delegate_.get();
128 network_session_params.http_server_properties = 127 network_session_params.http_server_properties =
129 url_request_context_->http_server_properties(); 128 url_request_context_->http_server_properties();
130 network_session_params.host_resolver = 129 network_session_params.host_resolver =
131 url_request_context_->host_resolver(); 130 url_request_context_->host_resolver();
132 131
133 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); 132 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
134 scoped_ptr<net::HttpCache::DefaultBackend> main_backend( 133 scoped_ptr<net::HttpCache::DefaultBackend> main_backend(
135 new net::HttpCache::DefaultBackend(net::DISK_CACHE, 134 new net::HttpCache::DefaultBackend(net::DISK_CACHE,
136 net::CACHE_BACKEND_DEFAULT, 135 net::CACHE_BACKEND_DEFAULT,
137 cache_path, 0, cache_task_runner_)); 136 cache_path, 0, cache_task_runner_));
(...skipping 15 matching lines...) Expand all
153 152
154 return url_request_context_.get(); 153 return url_request_context_.get();
155 } 154 }
156 155
157 scoped_refptr<base::SingleThreadTaskRunner> 156 scoped_refptr<base::SingleThreadTaskRunner>
158 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 157 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
159 return network_task_runner_; 158 return network_task_runner_;
160 } 159 }
161 160
162 } // namespace web 161 } // namespace web
OLDNEW
« no previous file with comments | « ios/crnet/crnet_environment.mm ('k') | jingle/glue/proxy_resolving_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698