Store in memory cookies in a hash set instead of a list.

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 
 #include "utility"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 98 matching lines @@
 }
 
 CannedBrowsingDataCookieHelper* CannedBrowsingDataCookieHelper::Clone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CannedBrowsingDataCookieHelper* clone =
       new CannedBrowsingDataCookieHelper(request_context_getter());
 
   for (OriginCookieListMap::iterator it = origin_cookie_list_map_.begin();
        it != origin_cookie_list_map_.end();
        ++it) {
-    net::CookieList* cookies = clone->GetCookiesFor(it->first);
-    cookies->insert(cookies->begin(), it->second->begin(), it->second->end());
+    net::CookieHashSet* cookies = clone->GetCookiesFor(it->first);
+    cookies->insert(it->second->begin(), it->second->end());
   }
   return clone;
 }
 
 void CannedBrowsingDataCookieHelper::AddReadCookies(
     const GURL& frame_url,
     const GURL& url,
     const net::CookieList& cookie_list) {
   typedef net::CookieList::const_iterator cookie_iterator;
   for (cookie_iterator add_cookie = cookie_list.begin();
@@ skipping 61 matching lines @@
   for (OriginCookieListMap::iterator it = origin_cookie_list_map_.begin();
        it != origin_cookie_list_map_.end();
        ++it) {
     DeleteMatchingCookie(cookie, it->second);
   }
   BrowsingDataCookieHelper::DeleteCookie(cookie);
 }
 
 bool CannedBrowsingDataCookieHelper::DeleteMatchingCookie(
     const net::CanonicalCookie& add_cookie,
-    net::CookieList* cookie_list) {
-  typedef net::CookieList::iterator cookie_iterator;
-  for (cookie_iterator cookie = cookie_list->begin();
-      cookie != cookie_list->end(); ++cookie) {
-    if (cookie->Name() == add_cookie.Name() &&
-        cookie->Domain() == add_cookie.Domain()&&
-        cookie->Path() == add_cookie.Path()) {
-      cookie_list->erase(cookie);
-      return true;
-    }
-  }
-  return false;
+    net::CookieHashSet* cookie_list) {
+  return cookie_list->erase(add_cookie) > 0;
 }
 
-net::CookieList* CannedBrowsingDataCookieHelper::GetCookiesFor(
+net::CookieHashSet* CannedBrowsingDataCookieHelper::GetCookiesFor(
     const GURL& first_party_origin) {
   OriginCookieListMap::iterator it =
       origin_cookie_list_map_.find(first_party_origin);
   if (it == origin_cookie_list_map_.end()) {
-    net::CookieList* cookies = new net::CookieList();
+    net::CookieHashSet* cookies = new net::CookieHashSet;
     origin_cookie_list_map_.insert(
-        std::pair<GURL, net::CookieList*>(first_party_origin, cookies));
+        std::pair<GURL, net::CookieHashSet*>(first_party_origin, cookies));
     return cookies;
   }
   return it->second;
 }
 
 void CannedBrowsingDataCookieHelper::AddCookie(
     const GURL& frame_url,
     const net::CanonicalCookie& cookie) {
   // Storing cookies in separate cookie lists per frame origin makes the
   // GetCookieCount method count a cookie multiple times if it is stored in
   // multiple lists.
   // E.g. let "example.com" be redirected to "www.example.com". A cookie set
   // with the cookie string "A=B; Domain=.example.com" would be sent to both
   // hosts. This means it would be stored in the separate cookie lists for both
   // hosts ("example.com", "www.example.com"). The method GetCookieCount would
   // count this cookie twice. To prevent this, we us a single global cookie
   // list as a work-around to store all added cookies. Per frame URL cookie
   // lists are currently not used. In the future they will be used for
   // collecting cookies per origin in redirect chains.
   // TODO(markusheintz): A) Change the GetCookiesCount method to prevent
   // counting cookies multiple times if they are stored in multiple cookie
   // lists.  B) Replace the GetCookieFor method call below with:
   // "GetCookiesFor(frame_url.GetOrigin());"
-  net::CookieList* cookie_list =
-      GetCookiesFor(GURL(kGlobalCookieListURL));
+  if (origin_cookie_url_.is_empty())
+    origin_cookie_url_ = GURL(kGlobalCookieListURL);
+  net::CookieHashSet* cookie_list = GetCookiesFor(origin_cookie_url_);

[Avi (use Gerrit), 2014/08/07 23:50:37]

Or...

static const GURL origin_cookie_url(kGlobalCookieListURL);
net::CookieHashSet* cookie_list = GetCookiesFor(origin_cookie_url);

Or something like that. It feels weird to have an instance variable that's
constant and only used by one member function.

[erikchen, 2014/08/08 00:35:27]

Done.

   DeleteMatchingCookie(cookie, cookie_list);
-  cookie_list->push_back(cookie);
+  cookie_list->insert(cookie);
 }