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

Side by Side Diff: trunk/src/content/shell/shell_url_request_context_getter.cc

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/strings/string_split.h" 11 #include "base/strings/string_split.h"
12 #include "base/threading/worker_pool.h" 12 #include "base/threading/worker_pool.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/public/common/url_constants.h" 15 #include "content/public/common/url_constants.h"
16 #include "content/shell/shell_network_delegate.h" 16 #include "content/shell/shell_network_delegate.h"
17 #include "content/shell/shell_switches.h" 17 #include "content/shell/shell_switches.h"
18 #include "net/base/cert_verifier.h" 18 #include "net/base/cert_verifier.h"
19 #include "net/base/host_resolver.h" 19 #include "net/base/host_resolver.h"
20 #include "net/base/mapped_host_resolver.h" 20 #include "net/base/mapped_host_resolver.h"
21 #include "net/cookies/cookie_monster.h" 21 #include "net/cookies/cookie_monster.h"
22 #include "net/http/http_auth_handler_factory.h" 22 #include "net/http/http_auth_handler_factory.h"
23 #include "net/http/http_cache.h" 23 #include "net/http/http_cache.h"
24 #include "net/http/http_network_session.h" 24 #include "net/http/http_network_session.h"
25 #include "net/http/http_server_properties_impl.h" 25 #include "net/http/http_server_properties_impl.h"
26 #include "net/proxy/proxy_service.h" 26 #include "net/proxy/proxy_service.h"
27 #include "net/ssl/default_server_bound_cert_store.h" 27 #include "net/ssl/default_server_bound_cert_store.h"
28 #include "net/ssl/server_bound_cert_service.h" 28 #include "net/ssl/server_bound_cert_service.h"
29 #include "net/ssl/ssl_config_service_defaults.h" 29 #include "net/ssl/ssl_config_service_defaults.h"
30 #include "net/url_request/data_protocol_handler.h"
31 #include "net/url_request/file_protocol_handler.h"
32 #include "net/url_request/protocol_intercept_job_factory.h" 30 #include "net/url_request/protocol_intercept_job_factory.h"
33 #include "net/url_request/static_http_user_agent_settings.h" 31 #include "net/url_request/static_http_user_agent_settings.h"
34 #include "net/url_request/url_request_context.h" 32 #include "net/url_request/url_request_context.h"
35 #include "net/url_request/url_request_context_storage.h" 33 #include "net/url_request/url_request_context_storage.h"
36 #include "net/url_request/url_request_job_factory_impl.h" 34 #include "net/url_request/url_request_job_factory_impl.h"
37 35
38 namespace content { 36 namespace content {
39 37
40 namespace { 38 namespace {
41 39
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 storage_->set_host_resolver(host_resolver.Pass()); 169 storage_->set_host_resolver(host_resolver.Pass());
172 network_session_params.host_resolver = 170 network_session_params.host_resolver =
173 url_request_context_->host_resolver(); 171 url_request_context_->host_resolver();
174 172
175 net::HttpCache* main_cache = new net::HttpCache( 173 net::HttpCache* main_cache = new net::HttpCache(
176 network_session_params, main_backend); 174 network_session_params, main_backend);
177 storage_->set_http_transaction_factory(main_cache); 175 storage_->set_http_transaction_factory(main_cache);
178 176
179 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( 177 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
180 new net::URLRequestJobFactoryImpl()); 178 new net::URLRequestJobFactoryImpl());
181 // Keep ProtocolHandlers added in sync with
182 // ShellContentBrowserClient::IsHandledURL().
183 InstallProtocolHandlers(job_factory.get(), &protocol_handlers_); 179 InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
184 bool set_protocol = job_factory->SetProtocolHandler(
185 chrome::kDataScheme,
186 new net::DataProtocolHandler);
187 DCHECK(set_protocol);
188 set_protocol = job_factory->SetProtocolHandler(
189 chrome::kFileScheme,
190 new net::FileProtocolHandler);
191 DCHECK(set_protocol);
192 storage_->set_job_factory(job_factory.release()); 180 storage_->set_job_factory(job_factory.release());
193 } 181 }
194 182
195 return url_request_context_.get(); 183 return url_request_context_.get();
196 } 184 }
197 185
198 scoped_refptr<base::SingleThreadTaskRunner> 186 scoped_refptr<base::SingleThreadTaskRunner>
199 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 187 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
200 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 188 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
201 } 189 }
202 190
203 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { 191 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
204 return url_request_context_->host_resolver(); 192 return url_request_context_->host_resolver();
205 } 193 }
206 194
207 } // namespace content 195 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/shell/shell_content_browser_client.cc ('k') | trunk/src/net/ftp/ftp_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698