Support Kerberos on Android

net/http/http_auth_handler_basic_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 26 matching lines @@
     std::string challenge = "Basic realm=\"Atlantis\"";
     scoped_ptr<HttpAuthHandler> basic;
     EXPECT_EQ(OK, factory.CreateAuthHandlerFromString(
         challenge, HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &basic));
     AuthCredentials credentials(base::ASCIIToUTF16(tests[i].username),
                                 base::ASCIIToUTF16(tests[i].password));
     HttpRequestInfo request_info;
     std::string auth_token;
     TestCompletionCallback callback;
     int rv = basic->GenerateAuthToken(&credentials, &request_info,
-                                      callback.callback(), &auth_token);
+                                      callback.callback(), &auth_token, NULL);

[Bernhard Bauer, 2015/05/15 15:06:16]

Use nullptr instead of NULL.

[aberent, 2015/05/18 13:45:27]

Shouldn't have been here at all! Fixed in a later patchset.

     EXPECT_EQ(OK, rv);
     EXPECT_STREQ(tests[i].expected_credentials, auth_token.c_str());
   }
 }
 
 TEST(HttpAuthHandlerBasicTest, HandleAnotherChallenge) {
   static const struct {
     const char* challenge;
     HttpAuth::AuthorizationResult expected_rv;
   } tests[] = {
@@ skipping 132 matching lines @@
     scoped_ptr<HttpAuthHandler> basic;
     int rv = factory.CreateAuthHandlerFromString(
         challenge, HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &basic);
     EXPECT_EQ(tests[i].expected_rv, rv);
     if (rv == OK)
       EXPECT_EQ(tests[i].expected_realm, basic->realm());
   }
 }
 
 }  // namespace net