OLD | NEW |
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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "chrome/browser/net/proxy_service_factory.h" | 36 #include "chrome/browser/net/proxy_service_factory.h" |
37 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 37 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
38 #include "chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.h" | 38 #include "chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.h" |
39 #include "chrome/browser/policy/policy_service.h" | 39 #include "chrome/browser/policy/policy_service.h" |
40 #include "chrome/common/chrome_switches.h" | 40 #include "chrome/common/chrome_switches.h" |
41 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
42 #include "content/public/browser/browser_thread.h" | 42 #include "content/public/browser/browser_thread.h" |
43 #include "net/base/cert_verifier.h" | 43 #include "net/base/cert_verifier.h" |
44 #include "net/base/host_cache.h" | 44 #include "net/base/host_cache.h" |
45 #include "net/base/host_mapping_rules.h" | 45 #include "net/base/host_mapping_rules.h" |
46 #include "net/base/host_resolver.h" | |
47 #include "net/base/mapped_host_resolver.h" | |
48 #include "net/base/net_util.h" | 46 #include "net/base/net_util.h" |
49 #include "net/base/sdch_manager.h" | 47 #include "net/base/sdch_manager.h" |
50 #include "net/cookies/cookie_monster.h" | 48 #include "net/cookies/cookie_monster.h" |
| 49 #include "net/dns/host_resolver.h" |
| 50 #include "net/dns/mapped_host_resolver.h" |
51 #include "net/ftp/ftp_network_layer.h" | 51 #include "net/ftp/ftp_network_layer.h" |
52 #include "net/http/http_auth_filter.h" | 52 #include "net/http/http_auth_filter.h" |
53 #include "net/http/http_auth_handler_factory.h" | 53 #include "net/http/http_auth_handler_factory.h" |
54 #include "net/http/http_network_layer.h" | 54 #include "net/http/http_network_layer.h" |
55 #include "net/http/http_server_properties_impl.h" | 55 #include "net/http/http_server_properties_impl.h" |
56 #include "net/proxy/proxy_config_service.h" | 56 #include "net/proxy/proxy_config_service.h" |
57 #include "net/proxy/proxy_script_fetcher_impl.h" | 57 #include "net/proxy/proxy_script_fetcher_impl.h" |
58 #include "net/proxy/proxy_service.h" | 58 #include "net/proxy/proxy_service.h" |
59 #include "net/spdy/spdy_session.h" | 59 #include "net/spdy/spdy_session.h" |
60 #include "net/ssl/default_server_bound_cert_store.h" | 60 #include "net/ssl/default_server_bound_cert_store.h" |
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
906 globals_->system_request_context.reset( | 906 globals_->system_request_context.reset( |
907 ConstructSystemRequestContext(globals_, net_log_)); | 907 ConstructSystemRequestContext(globals_, net_log_)); |
908 | 908 |
909 sdch_manager_->set_sdch_fetcher( | 909 sdch_manager_->set_sdch_fetcher( |
910 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 910 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
911 } | 911 } |
912 | 912 |
913 void IOThread::UpdateDnsClientEnabled() { | 913 void IOThread::UpdateDnsClientEnabled() { |
914 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 914 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
915 } | 915 } |
OLD | NEW |