This CL changes our per-domain limits to be per-effective domain.

This matches FireFox behavior and is for denial of service protection
when we go to FireFox expiry behavior (keeping cookies around
indefinitely if they don't have a max-age and are being used); see
issue (8850) for details.

BUG=8850
TEST=net_unittests/net_perftests on Linux with CookieMonsterTest.* filter

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

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

1 files changed, 6 insertions, 8 deletions

diff --git a/net/base/cookie_monster_store_test.h b/net/base/cookie_monster_store_test.h
index cd070a7..79d919f 100644
--- a/net/base/cookie_monster_store_test.h
+++ b/net/base/cookie_monster_store_test.h
@@ -21,12 +21,11 @@ struct CookieStoreCommand {
   };
 
   CookieStoreCommand(Type type,
-                     const std::string& key,
                      const net::CookieMonster::CanonicalCookie& cookie)
-      : type(type), key(key), cookie(cookie) {}
+      : type(type),
+        cookie(cookie) {}
 
   Type type;
-  std::string key;  // Only applicable to the ADD command.
   net::CookieMonster::CanonicalCookie cookie;
 };
 
@@ -49,22 +48,21 @@ class MockPersistentCookieStore
     return ok;
   }
 
-  virtual void AddCookie(const std::string& key,
-                         const net::CookieMonster::CanonicalCookie& cookie) {
+  virtual void AddCookie(const net::CookieMonster::CanonicalCookie& cookie) {
     commands_.push_back(
-        CookieStoreCommand(CookieStoreCommand::ADD, key, cookie));
+        CookieStoreCommand(CookieStoreCommand::ADD, cookie));
   }
 
   virtual void UpdateCookieAccessTime(
       const net::CookieMonster::CanonicalCookie& cookie) {
     commands_.push_back(CookieStoreCommand(
-        CookieStoreCommand::UPDATE_ACCESS_TIME, std::string(), cookie));
+        CookieStoreCommand::UPDATE_ACCESS_TIME, cookie));
   }
 
   virtual void DeleteCookie(
       const net::CookieMonster::CanonicalCookie& cookie) {
     commands_.push_back(
-        CookieStoreCommand(CookieStoreCommand::REMOVE, std::string(), cookie));
+        CookieStoreCommand(CookieStoreCommand::REMOVE, cookie));
   }
 
   void SetLoadExpectation(