Remove HttpAuth::Scheme enum in favor of a string.

net/http/http_auth_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 <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 31 matching lines @@
   return new HttpResponseHeaders(
       HttpUtil::AssembleRawHeaders(response.c_str(), response.length()));
 }
 
 HttpAuth::AuthorizationResult HandleChallengeResponse(
     bool connection_based,
     const std::string& headers_text,
     std::string* challenge_used) {
   scoped_ptr<HttpAuthHandlerMock> mock_handler(
       CreateMockHandler(connection_based));
-  std::set<HttpAuth::Scheme> disabled_schemes;
+  std::set<std::string> disabled_schemes;
   scoped_refptr<HttpResponseHeaders> headers(
       HeadersFromResponseText(headers_text));
   return HttpAuth::HandleChallengeResponse(
       mock_handler.get(),
       headers.get(),
       HttpAuth::AUTH_SERVER,
       disabled_schemes,
       challenge_used);
 }
 
 }  // namespace
 
 TEST(HttpAuthTest, ChooseBestChallenge) {
   static const struct {
     const char* headers;
-    HttpAuth::Scheme challenge_scheme;
+    const char* challenge_scheme;
     const char* challenge_realm;
   } tests[] = {
     {
       // Basic is the only challenge type, pick it.
       "Y: Digest realm=\"X\", nonce=\"aaaaaaaaaa\"\n"
       "www-authenticate: Basic realm=\"BasicRealm\"\n",
 
-      HttpAuth::AUTH_SCHEME_BASIC,
+      "basic",
       "BasicRealm",
     },
     {
       // Fake is the only challenge type, but it is unsupported.
       "Y: Digest realm=\"FooBar\", nonce=\"aaaaaaaaaa\"\n"
       "www-authenticate: Fake realm=\"FooBar\"\n",
 
-      HttpAuth::AUTH_SCHEME_MAX,
+      "",
       "",
     },
     {
       // Pick Digest over Basic.
       "www-authenticate: Basic realm=\"FooBar\"\n"
       "www-authenticate: Fake realm=\"FooBar\"\n"
       "www-authenticate: nonce=\"aaaaaaaaaa\"\n"
       "www-authenticate: Digest realm=\"DigestRealm\", nonce=\"aaaaaaaaaa\"\n",
 
-      HttpAuth::AUTH_SCHEME_DIGEST,
+      "digest",
       "DigestRealm",
     },
     {
       // Handle an empty header correctly.
       "Y: Digest realm=\"X\", nonce=\"aaaaaaaaaa\"\n"
       "www-authenticate:\n",
 
-      HttpAuth::AUTH_SCHEME_MAX,
+      "",
       "",
     },
     {
       "WWW-Authenticate: Negotiate\n"
       "WWW-Authenticate: NTLM\n",
 
 #if defined(USE_KERBEROS)
       // Choose Negotiate over NTLM on all platforms.
       // TODO(ahendrickson): This may be flaky on Linux and OSX as it
       // relies on being able to load one of the known .so files
       // for gssapi.
-      HttpAuth::AUTH_SCHEME_NEGOTIATE,
+      "negotiate",
 #else
       // On systems that don't use Kerberos fall back to NTLM.
-      HttpAuth::AUTH_SCHEME_NTLM,
+      "ntlm",
 #endif  // defined(USE_KERBEROS)
       "",
     }
   };
   GURL origin("http://www.example.com");
-  std::set<HttpAuth::Scheme> disabled_schemes;
+  std::set<std::string> disabled_schemes;
   MockAllowURLSecurityManager url_security_manager;
   scoped_ptr<HostResolver> host_resolver(new MockHostResolver());
   scoped_ptr<HttpAuthHandlerRegistryFactory> http_auth_handler_factory(
       HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
   http_auth_handler_factory->SetURLSecurityManager(
       "negotiate", &url_security_manager);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     // Make a HttpResponseHeaders object.
     std::string headers_with_status_line("HTTP/1.1 401 Unauthorized\n");
     headers_with_status_line += tests[i].headers;
     scoped_refptr<HttpResponseHeaders> headers(
         HeadersFromResponseText(headers_with_status_line));
 
     scoped_ptr<HttpAuthHandler> handler;
     HttpAuth::ChooseBestChallenge(http_auth_handler_factory.get(),
                                   headers.get(),
                                   HttpAuth::AUTH_SERVER,
                                   origin,
                                   disabled_schemes,
                                   BoundNetLog(),
                                   &handler);
 
     if (handler.get()) {
-      EXPECT_EQ(tests[i].challenge_scheme, handler->auth_scheme());
+      EXPECT_STREQ(tests[i].challenge_scheme, handler->auth_scheme().c_str());
       EXPECT_STREQ(tests[i].challenge_realm, handler->realm().c_str());
     } else {
-      EXPECT_EQ(HttpAuth::AUTH_SCHEME_MAX, tests[i].challenge_scheme);
+      EXPECT_STREQ("", tests[i].challenge_scheme);
       EXPECT_STREQ("", tests[i].challenge_realm);
     }
   }
 }
 
 TEST(HttpAuthTest, HandleChallengeResponse) {
   std::string challenge_used;
   const char* const kMockChallenge =
       "HTTP/1.1 401 Unauthorized\n"
       "WWW-Authenticate: Mock token_here\n";
@@ skipping 264 matching lines @@
   std::string name;
 
   name = HttpAuth::GetAuthorizationHeaderName(HttpAuth::AUTH_SERVER);
   EXPECT_STREQ("Authorization", name.c_str());
 
   name = HttpAuth::GetAuthorizationHeaderName(HttpAuth::AUTH_PROXY);
   EXPECT_STREQ("Proxy-Authorization", name.c_str());
 }
 
 }  // namespace net