| 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/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/browser/net/chrome_network_delegate.h" | 35 #include "chrome/browser/net/chrome_network_delegate.h" |
| 36 #include "chrome/browser/net/connect_interceptor.h" | 36 #include "chrome/browser/net/connect_interceptor.h" |
| 37 #include "chrome/browser/net/dns_probe_service.h" | 37 #include "chrome/browser/net/dns_probe_service.h" |
| 38 #include "chrome/browser/net/proxy_service_factory.h" | 38 #include "chrome/browser/net/proxy_service_factory.h" |
| 39 #include "chrome/common/channel_info.h" | 39 #include "chrome/common/channel_info.h" |
| 40 #include "chrome/common/chrome_content_client.h" | 40 #include "chrome/common/chrome_content_client.h" |
| 41 #include "chrome/common/chrome_switches.h" | 41 #include "chrome/common/chrome_switches.h" |
| 42 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
| 43 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" | 43 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" |
| 44 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" | 44 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" |
| 45 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_
names.h" | |
| 46 #include "components/data_usage/core/data_use_aggregator.h" | 45 #include "components/data_usage/core/data_use_aggregator.h" |
| 47 #include "components/data_usage/core/data_use_amortizer.h" | 46 #include "components/data_usage/core/data_use_amortizer.h" |
| 48 #include "components/data_usage/core/data_use_annotator.h" | 47 #include "components/data_usage/core/data_use_annotator.h" |
| 49 #include "components/net_log/chrome_net_log.h" | 48 #include "components/net_log/chrome_net_log.h" |
| 50 #include "components/policy/core/common/policy_service.h" | 49 #include "components/policy/core/common/policy_service.h" |
| 51 #include "components/proxy_config/pref_proxy_config_tracker.h" | 50 #include "components/proxy_config/pref_proxy_config_tracker.h" |
| 52 #include "components/variations/variations_associated_data.h" | 51 #include "components/variations/variations_associated_data.h" |
| 53 #include "components/version_info/version_info.h" | 52 #include "components/version_info/version_info.h" |
| 54 #include "content/public/browser/browser_thread.h" | 53 #include "content/public/browser/browser_thread.h" |
| 55 #include "content/public/browser/cookie_store_factory.h" | 54 #include "content/public/browser/cookie_store_factory.h" |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1006 registry->RegisterStringPref(prefs::kAuthSchemes, | 1005 registry->RegisterStringPref(prefs::kAuthSchemes, |
| 1007 "basic,digest,ntlm,negotiate"); | 1006 "basic,digest,ntlm,negotiate"); |
| 1008 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); | 1007 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); |
| 1009 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 1008 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
| 1010 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | 1009 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); |
| 1011 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | 1010 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
| 1012 std::string()); | 1011 std::string()); |
| 1013 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); | 1012 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); |
| 1014 registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType, | 1013 registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType, |
| 1015 std::string()); | 1014 std::string()); |
| 1016 registry->RegisterStringPref( | |
| 1017 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); | |
| 1018 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); | 1015 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); |
| 1019 data_reduction_proxy::RegisterPrefs(registry); | 1016 data_reduction_proxy::RegisterPrefs(registry); |
| 1020 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); | 1017 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); |
| 1021 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); | 1018 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); |
| 1022 } | 1019 } |
| 1023 | 1020 |
| 1024 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 1021 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
| 1025 net::HostResolver* resolver) { | 1022 net::HostResolver* resolver) { |
| 1026 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 1023 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
| 1027 if (!auth_server_whitelist_.empty()) { | 1024 if (!auth_server_whitelist_.empty()) { |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1666 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); | 1663 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); |
| 1667 | 1664 |
| 1668 context->set_job_factory( | 1665 context->set_job_factory( |
| 1669 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1666 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1670 | 1667 |
| 1671 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1668 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1672 // system URLRequestContext too. There's no reason this should be tied to a | 1669 // system URLRequestContext too. There's no reason this should be tied to a |
| 1673 // profile. | 1670 // profile. |
| 1674 return context; | 1671 return context; |
| 1675 } | 1672 } |
| OLD | NEW |