Do not set the whiltelist filter on the default auth handler

factory unless the --auth-server-whitelist command-line option
is specified.

R=ahendrickson,cbentzel
BUG=29596
TEST=HTTP NTLM or Negotiate authentication should work again.
Review URL: http://codereview.chromium.org/1569007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43134 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 13 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 5f9236b..478003e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -198,24 +198,22 @@ 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;
 
-  // Get whitelist information from the command line.
   if (command_line.HasSwitch(switches::kAuthServerWhitelist)) {
-    auth_server_whitelist =
+    std::string auth_server_whitelist =
         command_line.GetSwitchValueASCII(switches::kAuthServerWhitelist);
-  }
 
-  // Set the NTLM and Negotiate filters (from the same whitelist).
-  net::HttpAuthFilterWhitelist* ntlm_filter =
-    new net::HttpAuthFilterWhitelist();
-  net::HttpAuthFilterWhitelist* negotiate_filter =
-    new net::HttpAuthFilterWhitelist();
+    // 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);
+    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;
 }