Use AuthCredentials throughout the network stack instead of username/password.

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_
 #pragma once
 
 #include <list>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth.h"
 
 namespace net {
 
 // HttpAuthCache stores HTTP authentication identities and challenge info.
 // For each (origin, realm, scheme) triple the cache stores a
 // HttpAuthCache::Entry, which holds:
 //   - the origin server {protocol scheme, host, port}
@@ skipping 34 matching lines @@
   //   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).
-  //   |username| - login information for the realm.
-  //   |password| - login information for the realm.
+  //   |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& auth_challenge,
-             const string16& username,
-             const string16& password,
+             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 identity matches (|username|, |password|).
+  // 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).
-  //   |username| - condition to match.
-  //   |password| - condition to match.
+  //   |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 string16& username,
-              const string16& password);
+              const AuthCredentials& credentials);
 
   // Updates a stale digest entry on server |origin| for realm |realm| and
   // 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& auth_challenge);
@@ skipping 23 matching lines @@
   // The authentication scheme of the challenge.
   HttpAuth::Scheme scheme() const {
     return scheme_;
   }
 
   // The authentication challenge.
   const std::string auth_challenge() const {
     return auth_challenge_;
   }
 
-  // The login username.
-  const string16 username() const {
-    return username_;
-  }
-
-  // The login password.
-  const string16 password() const {
-    return password_;
+  // The login credentials.
+  const AuthCredentials& credentials() const {
+    return credentials_;
   }
 
   int IncrementNonceCount() {
     return ++nonce_count_;
   }
 
   void UpdateStaleChallenge(const std::string& auth_challenge);
 
  private:
   friend class HttpAuthCache;
@@ skipping 18 matching lines @@
   // 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_;
 
   // Identity.
   std::string auth_challenge_;
-  string16 username_;
-  string16 password_;
+  AuthCredentials credentials_;
 
   int nonce_count_;
 
   // List of paths that define the realm's protection space.
   PathList paths_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_CACHE_H_