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

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

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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"
20 #include "net/base/mapped_host_resolver.h"
21 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
20 #include "net/dns/host_resolver.h"
21 #include "net/dns/mapped_host_resolver.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/protocol_intercept_job_factory.h" 30 #include "net/url_request/protocol_intercept_job_factory.h"
31 #include "net/url_request/static_http_user_agent_settings.h" 31 #include "net/url_request/static_http_user_agent_settings.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 scoped_refptr<base::SingleThreadTaskRunner> 186 scoped_refptr<base::SingleThreadTaskRunner>
187 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 187 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
188 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 188 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
189 } 189 }
190 190
191 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { 191 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
192 return url_request_context_->host_resolver(); 192 return url_request_context_->host_resolver();
193 } 193 }
194 194
195 } // namespace content 195 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698