Replace NTLMv1 implementation with a functionally equivalent one.

net/http/http_auth_handler_ntlm.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "build/build_config.h"
 
 // This contains the portable and the SSPI implementations for NTLM.
 // We use NTLM_SSPI for Windows, and NTLM_PORTABLE for other platforms.
 #if defined(OS_WIN)
 #define NTLM_SSPI
 #else
 #define NTLM_PORTABLE
 #endif
 
 #if defined(NTLM_SSPI)
 #define SECURITY_WIN32 1
 #include <windows.h>
 #include <security.h>
 #include "net/http/http_auth_sspi_win.h"
+#elif defined(NTLM_PORTABLE)
+#include "net/ntlm/ntlm_client.h"
 #endif
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 
 namespace net {
@@ skipping 99 matching lines @@
   static GenerateRandomProc SetGenerateRandomProc(GenerateRandomProc proc);
   static HostNameProc SetHostNameProc(HostNameProc proc);
 #endif
 
   // Parse the challenge, saving the results into this instance.
   HttpAuth::AuthorizationResult ParseChallenge(
       HttpAuthChallengeTokenizer* tok, bool initial_challenge);
 
   // Given an input token received from the server, generate the next output
   // token to be sent to the server.
-  int GetNextToken(const void* in_token,
-                   uint32_t in_token_len,
-                   void** out_token,
-                   uint32_t* out_token_len);
+  ntlm::Buffer GetNextToken(const ntlm::Buffer& in_token);
 
   // Create an NTLM SPN to identify the |origin| server.
   static std::string CreateSPN(const GURL& origin);
 
 #if defined(NTLM_SSPI)
   HttpAuthSSPI auth_sspi_;
+#elif defined(NTLM_PORTABLE)
+  ntlm::NtlmClient ntlm_client_;
 #endif
 
 #if defined(NTLM_PORTABLE)
   static GenerateRandomProc generate_random_proc_;
   static HostNameProc get_host_name_proc_;
 #endif
 
   base::string16 domain_;
   AuthCredentials credentials_;
   std::string channel_bindings_;
 
   // The base64-encoded string following "NTLM" in the "WWW-Authenticate" or
   // "Proxy-Authenticate" response header.
   std::string auth_data_;
 
 #if defined(NTLM_SSPI)
   const HttpAuthPreferences* http_auth_preferences_;
 #endif
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_