Async support for HttpAuthHandler::GenerateAuthToken.

This CL changes the signature of GenerateAuthToken to support an async
completion of GenerateAuthToken. At this point, all of the
implementations complete synchronously, but a future version will
change Negotiate to complete asynchronously.

TEST=net_unittests
BUG=42222

Review URL: http://codereview.chromium.org/2671001

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

1 files changed, 6 insertions, 20 deletions

diff --git a/net/http/http_auth_handler_negotiate_win.cc b/net/http/http_auth_handler_negotiate_win.cc
index bfb8258..f29a9d8 100644
--- a/net/http/http_auth_handler_negotiate_win.cc
+++ b/net/http/http_auth_handler_negotiate_win.cc
@@ -31,18 +31,17 @@ HttpAuthHandlerNegotiate::HttpAuthHandlerNegotiate(
 HttpAuthHandlerNegotiate::~HttpAuthHandlerNegotiate() {
 }
 
-int HttpAuthHandlerNegotiate::GenerateAuthToken(
-    const std::wstring& username,
-    const std::wstring& password,
+int HttpAuthHandlerNegotiate::GenerateAuthTokenImpl(
+    const std::wstring* username,
+    const std::wstring* password,
     const HttpRequestInfo* request,
-    const ProxyInfo* proxy,
+    CompletionCallback* callback,
     std::string* auth_token) {
   return auth_sspi_.GenerateAuthToken(
-      &username,
-      &password,
+      username,
+      password,
       spn_,
       request,
-      proxy,
       auth_token);
 }
 
@@ -165,19 +164,6 @@ std::wstring HttpAuthHandlerNegotiate::CreateSPN(
   }
 }
 
-int HttpAuthHandlerNegotiate::GenerateDefaultAuthToken(
-    const HttpRequestInfo* request,
-    const ProxyInfo* proxy,
-    std::string* auth_token) {
-  return auth_sspi_.GenerateAuthToken(
-      NULL,  // username
-      NULL,  // password
-      spn_,
-      request,
-      proxy,
-      auth_token);
-}
-
 HttpAuthHandlerNegotiate::Factory::Factory()
     : disable_cname_lookup_(false),
       use_port_(false),