| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/leak_tracker.h" | 10 #include "base/debug/leak_tracker.h" |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); | 540 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); |
| 541 | 541 |
| 542 // This will delete the |notification_service_|. Make sure it's done after | 542 // This will delete the |notification_service_|. Make sure it's done after |
| 543 // anything else can reference it. | 543 // anything else can reference it. |
| 544 BrowserProcessSubThread::CleanUp(); | 544 BrowserProcessSubThread::CleanUp(); |
| 545 } | 545 } |
| 546 | 546 |
| 547 // static | 547 // static |
| 548 void IOThread::RegisterPrefs(PrefService* local_state) { | 548 void IOThread::RegisterPrefs(PrefService* local_state) { |
| 549 local_state->RegisterStringPref(prefs::kAuthSchemes, | 549 local_state->RegisterStringPref(prefs::kAuthSchemes, |
| 550 "basic,digest,ntlm,negotiate"); | 550 "basic,digest,ntlm,negotiate", |
| 551 false /* don't sync pref */); |
| 551 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, | 552 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, |
| 552 false); | 553 false, |
| 553 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 554 false /* don't sync pref */); |
| 554 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); | 555 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, |
| 555 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); | 556 false, |
| 556 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, ""); | 557 false /* don't sync pref */); |
| 557 local_state->RegisterBooleanPref(prefs::kEnableReferrers, true); | 558 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, |
| 559 "", |
| 560 false /* don't sync pref */); |
| 561 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
| 562 "", |
| 563 false /* don't sync pref */); |
| 564 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, |
| 565 "", |
| 566 false /* don't sync pref */); |
| 567 local_state->RegisterBooleanPref(prefs::kEnableReferrers, |
| 568 true, |
| 569 false /* don't sync pref */); |
| 558 } | 570 } |
| 559 | 571 |
| 560 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 572 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
| 561 net::HostResolver* resolver) { | 573 net::HostResolver* resolver) { |
| 562 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 574 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
| 563 if (!auth_server_whitelist_.empty()) { | 575 if (!auth_server_whitelist_.empty()) { |
| 564 auth_filter_default_credentials = | 576 auth_filter_default_credentials = |
| 565 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 577 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
| 566 } | 578 } |
| 567 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 579 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 system_params.network_delegate = globals_->system_network_delegate.get(); | 677 system_params.network_delegate = globals_->system_network_delegate.get(); |
| 666 system_params.net_log = net_log_; | 678 system_params.net_log = net_log_; |
| 667 globals_->system_http_transaction_factory.reset( | 679 globals_->system_http_transaction_factory.reset( |
| 668 new net::HttpNetworkLayer( | 680 new net::HttpNetworkLayer( |
| 669 new net::HttpNetworkSession(system_params))); | 681 new net::HttpNetworkSession(system_params))); |
| 670 globals_->system_ftp_transaction_factory.reset( | 682 globals_->system_ftp_transaction_factory.reset( |
| 671 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 683 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 672 globals_->system_request_context = | 684 globals_->system_request_context = |
| 673 ConstructSystemRequestContext(globals_, net_log_); | 685 ConstructSystemRequestContext(globals_, net_log_); |
| 674 } | 686 } |
| OLD | NEW |