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

net/ftp/ftp_auth_cache.h

Index: net/ftp/ftp_auth_cache.h
diff --git a/net/ftp/ftp_auth_cache.h b/net/ftp/ftp_auth_cache.h
index 6281f9dcffe1c3015adacbfe897a1aead8d7cf9a..393b23daa86209dc92d2ebb0fae132ba846e2f5d 100644
--- a/net/ftp/ftp_auth_cache.h
+++ b/net/ftp/ftp_auth_cache.h
@@ -8,8 +8,8 @@
 
 #include <list>
 
-#include "base/string16.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/auth.h"
 #include "net/base/net_export.h"
 
 namespace net {
@@ -28,13 +28,11 @@ class NET_EXPORT_PRIVATE FtpAuthCache {
   static const size_t kMaxEntries;
 
   struct Entry {
-    Entry(const GURL& origin, const string16& username,
-          const string16& password);
+    Entry(const GURL& origin, const AuthCredentials& credentials);
     ~Entry();
 
     const GURL origin;
-    string16 username;
-    string16 password;
+    AuthCredentials credentials;
   };
 
   FtpAuthCache();
@@ -43,16 +41,13 @@ class NET_EXPORT_PRIVATE FtpAuthCache {
   // Return Entry corresponding to given |origin| or NULL if not found.
   Entry* Lookup(const GURL& origin);
 
-  // Add an entry for |origin| to the cache (consisting of |username| and
-  // |password|). If there is already an entry for |origin|, it will be
-  // overwritten.
-  void Add(const GURL& origin, const string16& username,
-           const string16& password);
+  // Add an entry for |origin| to the cache using |credentials|. If there is
+  // already an entry for |origin|, it will be overwritten.
+  void Add(const GURL& origin, const AuthCredentials& credentials);
 
   // Remove the entry for |origin| from the cache, if one exists and matches
-  // |username| and |password|.
-  void Remove(const GURL& origin, const string16& username,
-              const string16& password);
+  // |credentials|.
+  void Remove(const GURL& origin, const AuthCredentials& credentials);
 
  private:
   typedef std::list<Entry> EntryList;