summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc25
1 files changed, 14 insertions, 11 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 83d81b6..60d0d4e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -195,22 +195,25 @@ net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory() {
// Get the whitelist information from the command line, create an
// HttpAuthFilterWhitelist, and attach it to the HttpAuthHandlerFactory.
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ std::string auth_server_whitelist;
- // Set the NTLM and Negotiate filters (from the same whitelist)
+ // Get whitelist information from the command line.
if (command_line.HasSwitch(switches::kAuthServerWhitelist)) {
- std::string ntlm_server_whitelist =
+ auth_server_whitelist =
command_line.GetSwitchValueASCII(switches::kAuthServerWhitelist);
- net::HttpAuthFilterWhitelist* ntlm_whitelist =
- new net::HttpAuthFilterWhitelist();
- net::HttpAuthFilterWhitelist* negotiate_whitelist =
- new net::HttpAuthFilterWhitelist();
-
- ntlm_whitelist->SetFilters(ntlm_server_whitelist);
- negotiate_whitelist->SetFilters(ntlm_server_whitelist);
- registry_factory->SetFilter("ntlm", ntlm_whitelist);
- registry_factory->SetFilter("negotiate", negotiate_whitelist);
}
+ // Set the NTLM and Negotiate filters (from the same whitelist).
+ net::HttpAuthFilterWhitelist* ntlm_filter =
+ new net::HttpAuthFilterWhitelist();
+ net::HttpAuthFilterWhitelist* negotiate_filter =
+ new net::HttpAuthFilterWhitelist();
+
+ ntlm_filter->SetWhitelist(auth_server_whitelist);
+ negotiate_filter->SetWhitelist(auth_server_whitelist);
+ registry_factory->SetFilter("ntlm", ntlm_filter);
+ registry_factory->SetFilter("negotiate", negotiate_filter);
+
return registry_factory;
}