Use SPNEGO mechanism with GSSAPI on Posix

net/http/http_auth_gssapi_posix_unittest.cc

Index: net/http/http_auth_gssapi_posix_unittest.cc
diff --git a/net/http/http_auth_gssapi_posix_unittest.cc b/net/http/http_auth_gssapi_posix_unittest.cc
index 8a1632397ee1c83fd487becfddb555e46d84232d..8a32c0e9106499ed0a865e0d17fe189437a126df 100644
--- a/net/http/http_auth_gssapi_posix_unittest.cc
+++ b/net/http/http_auth_gssapi_posix_unittest.cc
@@ -54,7 +54,7 @@ void EstablishInitialContext(test::MockGSSAPILibrary* library) {
       "localhost",                         // Source name
       "example.com",                       // Target name
       23,                                  // Lifetime
-      *CHROME_GSS_C_NT_HOSTBASED_SERVICE,  // Mechanism
+      *CHROME_GSS_SPNEGO_MECH_OID_DESC,    // Mechanism
       0,                                   // Context flags
       1,                                   // Locally initiated
       0);                                  // Open
@@ -98,7 +98,7 @@ TEST(HttpAuthGSSAPIPOSIXTest, GSSAPICycle) {
       "localhost",                         // Source name
       "example.com",                       // Target name
       23,                                  // Lifetime
-      *CHROME_GSS_C_NT_HOSTBASED_SERVICE,  // Mechanism
+      *CHROME_GSS_SPNEGO_MECH_OID_DESC,    // Mechanism
       0,                                   // Context flags
       1,                                   // Locally initiated
       0);                                  // Open
@@ -106,7 +106,7 @@ TEST(HttpAuthGSSAPIPOSIXTest, GSSAPICycle) {
       "localhost",                         // Source name
       "example.com",                       // Target name
       23,                                  // Lifetime
-      *CHROME_GSS_C_NT_HOSTBASED_SERVICE,  // Mechanism
+      *CHROME_GSS_SPNEGO_MECH_OID_DESC,    // Mechanism
       0,                                   // Context flags
       1,                                   // Locally initiated
       1);                                  // Open
@@ -179,7 +179,7 @@ TEST(HttpAuthGSSAPITest, ParseChallenge_FirstRound) {
   // The first round should just consist of an unadorned "Negotiate" header.
   test::MockGSSAPILibrary mock_library;
   HttpAuthGSSAPI auth_gssapi(&mock_library, "Negotiate",
-                             CHROME_GSS_KRB5_MECH_OID_DESC);
+                             CHROME_GSS_SPNEGO_MECH_OID_DESC);
   std::string challenge_text = "Negotiate";
   HttpAuth::ChallengeTokenizer challenge(challenge_text.begin(),
                                          challenge_text.end());
@@ -192,7 +192,7 @@ TEST(HttpAuthGSSAPITest, ParseChallenge_TwoRounds) {
   // have a valid base64 token associated with it.
   test::MockGSSAPILibrary mock_library;
   HttpAuthGSSAPI auth_gssapi(&mock_library, "Negotiate",
-                             CHROME_GSS_KRB5_MECH_OID_DESC);
+                             CHROME_GSS_SPNEGO_MECH_OID_DESC);
   std::string first_challenge_text = "Negotiate";
   HttpAuth::ChallengeTokenizer first_challenge(first_challenge_text.begin(),
                                                first_challenge_text.end());
@@ -217,7 +217,7 @@ TEST(HttpAuthGSSAPITest, ParseChallenge_UnexpectedTokenFirstRound) {
   // should be treated as an invalid challenge from the server.
   test::MockGSSAPILibrary mock_library;
   HttpAuthGSSAPI auth_gssapi(&mock_library, "Negotiate",
-                             CHROME_GSS_KRB5_MECH_OID_DESC);
+                             CHROME_GSS_SPNEGO_MECH_OID_DESC);
   std::string challenge_text = "Negotiate Zm9vYmFy";
   HttpAuth::ChallengeTokenizer challenge(challenge_text.begin(),
                                          challenge_text.end());
@@ -230,7 +230,7 @@ TEST(HttpAuthGSSAPITest, ParseChallenge_MissingTokenSecondRound) {
   // an authentication challenge rejection from the server or proxy.
   test::MockGSSAPILibrary mock_library;
   HttpAuthGSSAPI auth_gssapi(&mock_library, "Negotiate",
-                             CHROME_GSS_KRB5_MECH_OID_DESC);
+                             CHROME_GSS_SPNEGO_MECH_OID_DESC);
   std::string first_challenge_text = "Negotiate";
   HttpAuth::ChallengeTokenizer first_challenge(first_challenge_text.begin(),
                                                first_challenge_text.end());
@@ -253,7 +253,7 @@ TEST(HttpAuthGSSAPITest, ParseChallenge_NonBase64EncodedToken) {
   // be treated as an invalid challenge.
   test::MockGSSAPILibrary mock_library;
   HttpAuthGSSAPI auth_gssapi(&mock_library, "Negotiate",
-                             CHROME_GSS_KRB5_MECH_OID_DESC);
+                             CHROME_GSS_SPNEGO_MECH_OID_DESC);
   std::string first_challenge_text = "Negotiate";
   HttpAuth::ChallengeTokenizer first_challenge(first_challenge_text.begin(),
                                                first_challenge_text.end());