Allow replacing the HttpAuthHandlerFactory in URLRequestContextBuilder

android_webview/browser/net/aw_url_request_context_getter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 207 matching lines @@
 
   net::URLRequestContextBuilder::HttpNetworkSessionParams
       network_session_params;
   ApplyCmdlineOverridesToNetworkSessionParams(&network_session_params);
   builder.set_http_network_session_params(network_session_params);
   builder.SetSpdyAndQuicEnabled(true, false);
 
   scoped_ptr<net::MappedHostResolver> host_resolver(new net::MappedHostResolver(
       net::HostResolver::CreateDefaultResolver(nullptr)));
   ApplyCmdlineOverridesToHostResolver(host_resolver.get());
-  builder.add_http_auth_handler_factory(
-      "negotiate",
-      CreateNegotiateAuthHandlerFactory(host_resolver.get()).release());
+  builder.SetHttpAuthHandlerFactory(
+      CreateAuthHandlerFactory(host_resolver.get()).Pass());
   builder.set_host_resolver(host_resolver.Pass());
 
   url_request_context_ = builder.Build().Pass();
 
   job_factory_ = CreateJobFactory(&protocol_handlers_,
                                   request_interceptors_.Pass());
   job_factory_.reset(new net::URLRequestInterceptingJobFactory(
       job_factory_.Pass(),
       browser_context->GetDataReductionProxyIOData()->CreateInterceptor()));
   url_request_context_->set_job_factory(job_factory_.get());
@@ skipping 25 matching lines @@
   return net_log_.get();
 }
 
 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
   DCHECK(AwBrowserContext::GetDefault()->GetDataReductionProxyIOData());
   AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()->
       request_options()->SetKeyOnIO(key);
 }
 
 scoped_ptr<net::HttpAuthHandlerFactory>
-AwURLRequestContextGetter::CreateNegotiateAuthHandlerFactory(
+AwURLRequestContextGetter::CreateAuthHandlerFactory(
     net::HostResolver* resolver) {
   DCHECK(resolver);
-  std::vector<std::string> supported_schemes = {"negotiate"};
+
+  // In Chrome this is configurable via the AuthSchemes policy. For WebView
+  // there is no interest to have it available so far.
+  std::vector<std::string> supported_schemes = {"basic", "digest", "negotiate"};
   http_auth_preferences_.reset(new net::HttpAuthPreferences(supported_schemes));
   http_auth_preferences_->set_server_whitelist(auth_server_whitelist_);
   http_auth_preferences_->set_auth_android_negotiate_account_type(
       auth_android_negotiate_account_type_);
-  scoped_ptr<net::HttpAuthHandlerFactory> negotiate_factory(
-      net::HttpAuthHandlerRegistryFactory::Create(http_auth_preferences_.get(),
-                                                  resolver));
-  return negotiate_factory;
+  return net::HttpAuthHandlerRegistryFactory::Create(
+      http_auth_preferences_.get(), resolver);
 }
 
 }  // namespace android_webview