1 files changed, 40 insertions, 24 deletions

diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc
index b23781e..005de89 100644
--- a/net/ftp/ftp_auth_cache_unittest.cc
+++ b/net/ftp/ftp_auth_cache_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -10,6 +10,22 @@
 
 using net::FtpAuthCache;
 
+namespace {
+
+const string16 kBogus(ASCIIToUTF16("bogus"));
+const string16 kOthername(ASCIIToUTF16("othername"));
+const string16 kOtherword(ASCIIToUTF16("otherword"));
+const string16 kPassword(ASCIIToUTF16("password"));
+const string16 kPassword1(ASCIIToUTF16("password1"));
+const string16 kPassword2(ASCIIToUTF16("password2"));
+const string16 kPassword3(ASCIIToUTF16("password3"));
+const string16 kUsername(ASCIIToUTF16("username"));
+const string16 kUsername1(ASCIIToUTF16("username1"));
+const string16 kUsername2(ASCIIToUTF16("username2"));
+const string16 kUsername3(ASCIIToUTF16("username3"));
+
+}  // namespace
+
 TEST(FtpAuthCacheTest, LookupAddRemove) {
   FtpAuthCache cache;
 
@@ -20,38 +36,38 @@ TEST(FtpAuthCacheTest, LookupAddRemove) {
   EXPECT_TRUE(cache.Lookup(origin1) == NULL);
 
   // Add entry for origin1.
-  cache.Add(origin1, L"username1", L"password1");
+  cache.Add(origin1, kUsername1, kPassword1);
   FtpAuthCache::Entry* entry1 = cache.Lookup(origin1);
   ASSERT_TRUE(entry1);
   EXPECT_EQ(origin1, entry1->origin);
-  EXPECT_EQ(L"username1", entry1->username);
-  EXPECT_EQ(L"password1", entry1->password);
+  EXPECT_EQ(kUsername1, entry1->username);
+  EXPECT_EQ(kPassword1, entry1->password);
 
   // Add an entry for origin2.
-  cache.Add(origin2, L"username2", L"password2");
+  cache.Add(origin2, kUsername2, kPassword2);
   FtpAuthCache::Entry* entry2 = cache.Lookup(origin2);
   ASSERT_TRUE(entry2);
   EXPECT_EQ(origin2, entry2->origin);
-  EXPECT_EQ(L"username2", entry2->username);
-  EXPECT_EQ(L"password2", entry2->password);
+  EXPECT_EQ(kUsername2, entry2->username);
+  EXPECT_EQ(kPassword2, entry2->password);
 
   // The original entry1 should still be there.
   EXPECT_EQ(entry1, cache.Lookup(origin1));
 
   // Overwrite the entry for origin1.
-  cache.Add(origin1, L"username3", L"password3");
+  cache.Add(origin1, kUsername3, kPassword3);
   FtpAuthCache::Entry* entry3 = cache.Lookup(origin1);
   ASSERT_TRUE(entry3);
   EXPECT_EQ(origin1, entry3->origin);
-  EXPECT_EQ(L"username3", entry3->username);
-  EXPECT_EQ(L"password3", entry3->password);
+  EXPECT_EQ(kUsername3, entry3->username);
+  EXPECT_EQ(kPassword3, entry3->password);
 
   // Remove entry of origin1.
-  cache.Remove(origin1, L"username3", L"password3");
+  cache.Remove(origin1, kUsername3, kPassword3);
   EXPECT_TRUE(cache.Lookup(origin1) == NULL);
 
   // Remove non-existent entry.
-  cache.Remove(origin1, L"username3", L"password3");
+  cache.Remove(origin1, kUsername3, kPassword3);
   EXPECT_TRUE(cache.Lookup(origin1) == NULL);
 }
 
@@ -63,8 +79,8 @@ TEST(FtpAuthCacheTest, LookupWithPort) {
   GURL origin1("ftp://foo:80");
   GURL origin2("ftp://foo:21");
 
-  cache.Add(origin1, L"username", L"password");
-  cache.Add(origin2, L"username", L"password");
+  cache.Add(origin1, kUsername, kPassword);
+  cache.Add(origin2, kUsername, kPassword);
 
   EXPECT_NE(cache.Lookup(origin1), cache.Lookup(origin2));
 }
@@ -77,7 +93,7 @@ TEST(FtpAuthCacheTest, NormalizedKey) {
   FtpAuthCache cache;
 
   // Add.
-  cache.Add(GURL("ftp://HoSt:21"), L"username", L"password");
+  cache.Add(GURL("ftp://HoSt:21"), kUsername, kPassword);
 
   // Lookup.
   FtpAuthCache::Entry* entry1 = cache.Lookup(GURL("ftp://HoSt:21"));
@@ -86,30 +102,30 @@ TEST(FtpAuthCacheTest, NormalizedKey) {
   EXPECT_EQ(entry1, cache.Lookup(GURL("ftp://host")));
 
   // Overwrite.
-  cache.Add(GURL("ftp://host"), L"othername", L"otherword");
+  cache.Add(GURL("ftp://host"), kOthername, kOtherword);
   FtpAuthCache::Entry* entry2 = cache.Lookup(GURL("ftp://HoSt:21"));
   ASSERT_TRUE(entry2);
   EXPECT_EQ(GURL("ftp://host"), entry2->origin);
-  EXPECT_EQ(L"othername", entry2->username);
-  EXPECT_EQ(L"otherword", entry2->password);
+  EXPECT_EQ(kOthername, entry2->username);
+  EXPECT_EQ(kOtherword, entry2->password);
 
   // Remove
-  cache.Remove(GURL("ftp://HOsT"), L"othername", L"otherword");
+  cache.Remove(GURL("ftp://HOsT"), kOthername, kOtherword);
   EXPECT_TRUE(cache.Lookup(GURL("ftp://host")) == NULL);
 }
 
 TEST(FtpAuthCacheTest, OnlyRemoveMatching) {
   FtpAuthCache cache;
 
-  cache.Add(GURL("ftp://host"), L"username", L"password");
+  cache.Add(GURL("ftp://host"), kUsername, kPassword);
   EXPECT_TRUE(cache.Lookup(GURL("ftp://host")));
 
   // Auth data doesn't match, shouldn't remove.
-  cache.Remove(GURL("ftp://host"), L"bogus", L"bogus");
+  cache.Remove(GURL("ftp://host"), kBogus, kBogus);
   EXPECT_TRUE(cache.Lookup(GURL("ftp://host")));
 
   // Auth data matches, should remove.
-  cache.Remove(GURL("ftp://host"), L"username", L"password");
+  cache.Remove(GURL("ftp://host"), kUsername, kPassword);
   EXPECT_TRUE(cache.Lookup(GURL("ftp://host")) == NULL);
 }
 
@@ -117,7 +133,7 @@ TEST(FtpAuthCacheTest, EvictOldEntries) {
   FtpAuthCache cache;
 
   for (size_t i = 0; i < FtpAuthCache::kMaxEntries; i++)
-    cache.Add(GURL("ftp://host" + IntToString(i)), L"username", L"password");
+    cache.Add(GURL("ftp://host" + IntToString(i)), kUsername, kPassword);
 
   // No entries should be evicted before reaching the limit.
   for (size_t i = 0; i < FtpAuthCache::kMaxEntries; i++) {
@@ -125,7 +141,7 @@ TEST(FtpAuthCacheTest, EvictOldEntries) {
   }
 
   // Adding one entry should cause eviction of the first entry.
-  cache.Add(GURL("ftp://last_host"), L"username", L"password");
+  cache.Add(GURL("ftp://last_host"), kUsername, kPassword);
   EXPECT_TRUE(cache.Lookup(GURL("ftp://host0")) == NULL);
 
   // Remaining entries should not get evicted.