[net/http auth] Use strings to identify authentication schemes.

net/http/http_auth_cache.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_CACHE_H_
 #define NET_HTTP_HTTP_AUTH_CACHE_H_
 
 #include <list>
 #include <string>
 
@@ skipping 20 matching lines @@
    public:
     ~Entry();
 
     const GURL& origin() const {
       return origin_;
     }
 
     // The case-sensitive realm string of the challenge.
     const std::string& realm() const { return realm_; }
 
-    // The authentication scheme of the challenge.
-    HttpAuth::Scheme scheme() const {
-      return scheme_;
-    }
+    // The normalized authentication scheme of the challenge. See
+    // HttpAuth::IsValidNormalizedScheme().
+    const std::string& scheme() const { return scheme_; }
 
     // The authentication challenge.
     const std::string& auth_challenge() const { return auth_challenge_; }
 
     // The login credentials.
     const AuthCredentials& credentials() const {
       return credentials_;
     }
 
     int IncrementNonceCount() {
@@ skipping 21 matching lines @@
     // path is found, |*path_len| is left unmodified.
     //
     // Note that proxy auth cache entries are associated with empty
     // paths.  Therefore it is possible for HasEnclosingPath() to return
     // true and set |*path_len| to 0.
     bool HasEnclosingPath(const std::string& dir, size_t* path_len);
 
     // |origin_| contains the {protocol, host, port} of the server.
     GURL origin_;
     std::string realm_;
-    HttpAuth::Scheme scheme_;
+    std::string scheme_;
 
     // Identity.
     std::string auth_challenge_;
     AuthCredentials credentials_;
 
     int nonce_count_;
 
     // List of paths that define the realm's protection space.
     PathList paths_;
 
@@ skipping 10 matching lines @@
   enum { kMaxNumPathsPerRealmEntry = 10 };
   enum { kMaxNumRealmEntries = 10 };
 
   HttpAuthCache();
   ~HttpAuthCache();
 
   // Find the realm entry on server |origin| for realm |realm| and
   // scheme |scheme|.
   //   |origin| - the {scheme, host, port} of the server.
   //   |realm|  - case sensitive realm string.
-  //   |scheme| - the authentication scheme (i.e. basic, negotiate).
+  //   |scheme| - the normalized authentication scheme (i.e. basic, negotiate).
   //   returns  - the matched entry or NULL.
   Entry* Lookup(const GURL& origin,
                 const std::string& realm,
-                HttpAuth::Scheme scheme);
+                const std::string& scheme);
 
   // Find the entry on server |origin| whose protection space includes
   // |path|. This uses the assumption in RFC 2617 section 2 that deeper
   // paths lie in the same protection space.
   //   |origin| - the {scheme, host, port} of the server.
   //   |path|   - absolute path of the resource, or empty string in case of
   //              proxy auth (which does not use the concept of paths).
   //   returns  - the matched entry or NULL.
   Entry* LookupByPath(const GURL& origin, const std::string& path);
 
   // Add an entry on server |origin| for realm |handler->realm()| and
   // scheme |handler->scheme()|.  If an entry for this (realm,scheme)
   // already exists, update it rather than replace it -- this  preserves the
   // paths list.
   //   |origin|   - the {scheme, host, port} of the server.
   //   |realm|    - the auth realm for the challenge.
-  //   |scheme|   - the authentication scheme (i.e. basic, negotiate).
+  //   |scheme|   - the normalized authentication scheme (i.e. basic,
+  //   negotiate).
   //   |credentials| - login information for the realm.
   //   |path|     - absolute path for a resource contained in the protection
   //                space; this will be added to the list of known paths.
   //   returns    - the entry that was just added/updated.
   Entry* Add(const GURL& origin,
              const std::string& realm,
-             HttpAuth::Scheme scheme,
+             const std::string& scheme,
              const std::string& auth_challenge,
              const AuthCredentials& credentials,
              const std::string& path);
 
   // Remove entry on server |origin| for realm |realm| and scheme |scheme|
   // if one exists AND if the cached credentials matches |credentials|.
   //   |origin|   - the {scheme, host, port} of the server.
   //   |realm|    - case sensitive realm string.
-  //   |scheme|   - the authentication scheme (i.e. basic, negotiate).
+  //   |scheme|   - the normalized authentication scheme (i.e. basic,
+  //   negotiate).
   //   |credentials| - the credentials to match.
   //   returns    - true if an entry was removed.
   bool Remove(const GURL& origin,
               const std::string& realm,
-              HttpAuth::Scheme scheme,
+              const std::string& scheme,
               const AuthCredentials& credentials);
 
   // Clears the cache.
   void Clear();
 
   // Updates a stale digest entry on server |origin| for realm |realm| and
-  // scheme |scheme|. The cached auth challenge is replaced with
+  // normalized scheme |scheme|. The cached auth challenge is replaced with
   // |auth_challenge| and the nonce count is reset.
   // |UpdateStaleChallenge()| returns true if a matching entry exists in the
   // cache, false otherwise.
   bool UpdateStaleChallenge(const GURL& origin,
                             const std::string& realm,
-                            HttpAuth::Scheme scheme,
+                            const std::string& scheme,
                             const std::string& auth_challenge);
 
   // Copies all entries from |other| cache.
   void UpdateAllFrom(const HttpAuthCache& other);
 
  private:
   typedef std::list<Entry> EntryList;
   EntryList entries_;
 };
 
 // An authentication realm entry.
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_CACHE_H_