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

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

Issue 11931024: Removed static factories for data, ftp, file, and about jobs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 7 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 | 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_split.h" 10 #include "base/string_split.h"
11 #include "base/string_util.h" 11 #include "base/string_util.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/shell/shell_network_delegate.h" 16 #include "content/shell/shell_network_delegate.h"
16 #include "net/base/cert_verifier.h" 17 #include "net/base/cert_verifier.h"
17 #include "net/base/default_server_bound_cert_store.h" 18 #include "net/base/default_server_bound_cert_store.h"
18 #include "net/base/host_resolver.h" 19 #include "net/base/host_resolver.h"
19 #include "net/base/mapped_host_resolver.h" 20 #include "net/base/mapped_host_resolver.h"
20 #include "net/base/server_bound_cert_service.h" 21 #include "net/base/server_bound_cert_service.h"
21 #include "net/base/ssl_config_service_defaults.h" 22 #include "net/base/ssl_config_service_defaults.h"
22 #include "net/cookies/cookie_monster.h" 23 #include "net/cookies/cookie_monster.h"
23 #include "net/http/http_auth_handler_factory.h" 24 #include "net/http/http_auth_handler_factory.h"
24 #include "net/http/http_cache.h" 25 #include "net/http/http_cache.h"
25 #include "net/http/http_network_session.h" 26 #include "net/http/http_network_session.h"
26 #include "net/http/http_server_properties_impl.h" 27 #include "net/http/http_server_properties_impl.h"
27 #include "net/proxy/proxy_service.h" 28 #include "net/proxy/proxy_service.h"
29 #include "net/url_request/data_protocol_handler.h"
30 #include "net/url_request/file_protocol_handler.h"
28 #include "net/url_request/static_http_user_agent_settings.h" 31 #include "net/url_request/static_http_user_agent_settings.h"
29 #include "net/url_request/url_request_context.h" 32 #include "net/url_request/url_request_context.h"
30 #include "net/url_request/url_request_context_storage.h" 33 #include "net/url_request/url_request_context_storage.h"
31 #include "net/url_request/url_request_job_factory_impl.h" 34 #include "net/url_request/url_request_job_factory_impl.h"
32 35
33 namespace content { 36 namespace content {
34 37
35 ShellURLRequestContextGetter::ShellURLRequestContextGetter( 38 ShellURLRequestContextGetter::ShellURLRequestContextGetter(
36 bool ignore_certificate_errors, 39 bool ignore_certificate_errors,
37 const FilePath& base_path, 40 const FilePath& base_path,
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 140
138 // Give |storage_| ownership at the end in case it's |mapped_host_resolver|. 141 // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
139 storage_->set_host_resolver(host_resolver.Pass()); 142 storage_->set_host_resolver(host_resolver.Pass());
140 network_session_params.host_resolver = 143 network_session_params.host_resolver =
141 url_request_context_->host_resolver(); 144 url_request_context_->host_resolver();
142 145
143 net::HttpCache* main_cache = new net::HttpCache( 146 net::HttpCache* main_cache = new net::HttpCache(
144 network_session_params, main_backend); 147 network_session_params, main_backend);
145 storage_->set_http_transaction_factory(main_cache); 148 storage_->set_http_transaction_factory(main_cache);
146 149
147 storage_->set_job_factory(new net::URLRequestJobFactoryImpl); 150 net::URLRequestJobFactoryImpl* job_factory =
151 new net::URLRequestJobFactoryImpl;
152 // Keep ProtocolHandlers added in sync with
153 // ShellContentBrowserClient::IsHandledURL().
154 job_factory->SetProtocolHandler(chrome::kDataScheme,
155 new net::DataProtocolHandler);
156 job_factory->SetProtocolHandler(chrome::kFileScheme,
157 new net::FileProtocolHandler);
158 storage_->set_job_factory(job_factory);
148 } 159 }
149 160
150 return url_request_context_.get(); 161 return url_request_context_.get();
151 } 162 }
152 163
153 scoped_refptr<base::SingleThreadTaskRunner> 164 scoped_refptr<base::SingleThreadTaskRunner>
154 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 165 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
155 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 166 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
156 } 167 }
157 168
158 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { 169 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
159 return url_request_context_->host_resolver(); 170 return url_request_context_->host_resolver();
160 } 171 }
161 172
162 } // namespace content 173 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698