Make the cookie list a class (instead of a typedef inside CookieMonster)...

...so it can be forward declared

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/5462002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68173 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 26 insertions, 25 deletions

diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
index caf98a3..fdfd779 100644
--- a/net/base/cookie_monster.cc
+++ b/net/base/cookie_monster.cc
@@ -1318,7 +1318,7 @@ void CookieMonster::DeleteCookie(const GURL& url,
   }
 }
 
-CookieMonster::CookieList CookieMonster::GetAllCookies() {
+CookieList CookieMonster::GetAllCookies() {
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -1351,7 +1351,7 @@ CookieMonster::CookieList CookieMonster::GetAllCookies() {
   return cookie_list;
 }
 
-CookieMonster::CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
+CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
   AutoLock autolock(lock_);
   InitIfNecessary();
 
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index cdb508e..44bd510 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -29,6 +29,8 @@ class Histogram;
 
 namespace net {
 
+class CookieList;
+
 // The cookie monster is the system for storing and retrieving cookies. It has
 // an in-memory list of all cookies, and synchronizes non-session cookies to an
 // optional permanent storage that implements the PersistentCookieStore
@@ -94,7 +96,6 @@ class CookieMonster : public CookieStore {
   // subtantially more entries in the map.
   typedef std::multimap<std::string, CanonicalCookie*> CookieMap;
   typedef std::pair<CookieMap::iterator, CookieMap::iterator> CookieMapItPair;
-  typedef std::vector<CanonicalCookie> CookieList;
 
   // The key and expiry scheme to be used by the monster.
   // EKS_KEEP_RECENT_AND_PURGE_ETLDP1 means to use
@@ -693,6 +694,9 @@ class CookieMonster::PersistentCookieStore
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
+class CookieList : public std::vector<CookieMonster::CanonicalCookie> {
+};
+
 }  // namespace net
 
 #endif  // NET_BASE_COOKIE_MONSTER_H_
diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc
index 6fce2a0..e807ca1 100644
--- a/net/base/cookie_monster_unittest.cc
+++ b/net/base/cookie_monster_unittest.cc
@@ -1003,7 +1003,7 @@ TEST(CookieMonsterTest, TestSecure) {
 }
 
 static Time GetFirstCookieAccessDate(net::CookieMonster* cm) {
-  const net::CookieMonster::CookieList all_cookies(cm->GetAllCookies());
+  const net::CookieList all_cookies(cm->GetAllCookies());
   return all_cookies.front().LastAccessDate();
 }
 
@@ -1138,8 +1138,8 @@ TEST(CookieMonsterTest, NetUtilCookieTest) {
 static bool FindAndDeleteCookie(net::CookieMonster* cm,
                                 const std::string& domain,
                                 const std::string& name) {
-  net::CookieMonster::CookieList cookies = cm->GetAllCookies();
-  for (net::CookieMonster::CookieList::iterator it = cookies.begin();
+  net::CookieList cookies = cm->GetAllCookies();
+  for (net::CookieList::iterator it = cookies.begin();
        it != cookies.end(); ++it)
     if (it->Domain() == domain && it->Name() == name)
       return cm->DeleteCanonicalCookie(*it);
@@ -1204,9 +1204,8 @@ TEST(CookieMonsterTest, GetAllCookiesForURL) {
   PlatformThread::Sleep(kLastAccessThresholdMilliseconds + 20);
 
   // Check cookies for url.
-  net::CookieMonster::CookieList cookies =
-      cm->GetAllCookiesForURL(url_google);
-  net::CookieMonster::CookieList::iterator it = cookies.begin();
+  net::CookieList cookies = cm->GetAllCookiesForURL(url_google);
+  net::CookieList::iterator it = cookies.begin();
 
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("www.google.izzle", it->Domain());
@@ -1258,9 +1257,8 @@ TEST(CookieMonsterTest, GetAllCookiesForURLPathMatching) {
                                        "E=F;",
                                        options));
 
-  net::CookieMonster::CookieList cookies =
-      cm->GetAllCookiesForURL(url_google_foo);
-  net::CookieMonster::CookieList::iterator it = cookies.begin();
+  net::CookieList cookies = cm->GetAllCookiesForURL(url_google_foo);
+  net::CookieList::iterator it = cookies.begin();
 
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("A", it->Name());
@@ -1299,10 +1297,10 @@ TEST(CookieMonsterTest, DeleteCookieByName) {
 
   cm->DeleteCookie(GURL(std::string(kUrlGoogle) + "/foo/bar"), "A");
 
-  net::CookieMonster::CookieList cookies = cm->GetAllCookies();
+  net::CookieList cookies = cm->GetAllCookies();
   size_t expected_size = 4;
   EXPECT_EQ(expected_size, cookies.size());
-  for (net::CookieMonster::CookieList::iterator it = cookies.begin();
+  for (net::CookieList::iterator it = cookies.begin();
        it != cookies.end(); ++it) {
     EXPECT_NE("A1", it->Value());
     EXPECT_NE("A2", it->Value());
@@ -1494,7 +1492,7 @@ TEST(CookieMonsterTest, DontImportDuplicateCreationTimes) {
 
   scoped_refptr<net::CookieMonster> cm(new net::CookieMonster(store, NULL));
 
-  net::CookieMonster::CookieList list(cm->GetAllCookies());
+  net::CookieList list(cm->GetAllCookies());
   EXPECT_EQ(2U, list.size());
   // Confirm that we have one of each.
   std::string name1(list[0].Name());
@@ -1617,9 +1615,8 @@ TEST(CookieMonsterTest, SetCookieWithDetails) {
       url_google_foo, "A=", "B", std::string(), "foo", base::Time(),
       false, false));
 
-  net::CookieMonster::CookieList cookies =
-      cm->GetAllCookiesForURL(url_google_foo);
-  net::CookieMonster::CookieList::iterator it = cookies.begin();
+  net::CookieList cookies = cm->GetAllCookiesForURL(url_google_foo);
+  net::CookieList::iterator it = cookies.begin();
 
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("A", it->Name());
@@ -1771,10 +1768,10 @@ TEST(CookieMonsterTest, UniqueCreationTime) {
                            ".google.com", "/", Time(), false, false);
 
   // Now we check
-  net::CookieMonster::CookieList cookie_list(cm->GetAllCookies());
+  net::CookieList cookie_list(cm->GetAllCookies());
   typedef std::map<int64, net::CookieMonster::CanonicalCookie> TimeCookieMap;
   TimeCookieMap check_map;
-  for (net::CookieMonster::CookieList::const_iterator it = cookie_list.begin();
+  for (net::CookieList::const_iterator it = cookie_list.begin();
        it != cookie_list.end(); it++) {
     const int64 creation_date = it->CreationDate().ToInternalValue();
     TimeCookieMap::const_iterator
@@ -1867,7 +1864,7 @@ TEST(CookieMonsterTest, BackingStoreCommunication) {
   // Create a new cookie monster and make sure that everything is correct
   {
     scoped_refptr<net::CookieMonster> cmin(new CookieMonster(store, NULL));
-    CookieMonster::CookieList cookies(cmin->GetAllCookies());
+    CookieList cookies(cmin->GetAllCookies());
     ASSERT_EQ(2u, cookies.size());
     // Ordering is path length, then creation time.  So second cookie
     // will come first, and we need to swap them.
@@ -1914,7 +1911,7 @@ TEST(CookieMonsterTest, CookieOrdering) {
                 CookieOptions()));
   {
     unsigned int i = 0;
-    CookieMonster::CookieList cookies(cm->GetAllCookiesForURL(
+    CookieList cookies(cm->GetAllCookiesForURL(
         GURL("http://d.c.b.a.google.com/aa/bb/cc/dd")));
     ASSERT_EQ(5u, cookies.size());
     EXPECT_EQ("d", cookies[i++].Name());
@@ -1926,7 +1923,7 @@ TEST(CookieMonsterTest, CookieOrdering) {
 
   {
     unsigned int i = 0;
-    CookieMonster::CookieList cookies(cm->GetAllCookies());
+    CookieList cookies(cm->GetAllCookies());
     ASSERT_EQ(6u, cookies.size());
     EXPECT_EQ("d", cookies[i++].Name());
     EXPECT_EQ("a", cookies[i++].Name());
@@ -2047,7 +2044,7 @@ TEST(CookieMonsterTest, ForceSessionOnly) {
       options));
 
   // Get the canonical cookie.
-  CookieMonster::CookieList cookie_list = cm->GetAllCookies();
+  CookieList cookie_list = cm->GetAllCookies();
   ASSERT_EQ(1U, cookie_list.size());
   ASSERT_FALSE(cookie_list[0].IsPersistent());
 
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 54f8e6a..eaee403 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1745,7 +1745,7 @@ TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
   }
 
   // Now, check the cookie store.
-  net::CookieMonster::CookieList cookies =
+  net::CookieList cookies =
       context->cookie_store()->GetCookieMonster()->GetAllCookies();
   EXPECT_EQ(1U, cookies.size());
   EXPECT_FALSE(cookies[0].IsPersistent());