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

chrome/browser/browsing_data/browsing_data_cookie_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "net/cookies/cookie_monster.h"
+#include "url/gurl.h"
 
 class GURL;

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

If you include the header you shouldn't need to forward declare this.

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

Removed.

 
 namespace net {
 class CanonicalCookie;
 class URLRequestContextGetter;
 }
 
 // This class fetches cookie information on behalf of a caller
 // on the UI thread.
 // A client of this class need to call StartFetching from the UI thread to
 // initiate the flow, and it'll be notified by the callback in its UI
@@ skipping 56 matching lines @@
 // that are received from a server or set via JavaScript using the method
 // AddChangedCookie.
 // Cookies are distinguished by the tuple cookie name (called cookie-name in
 // RFC 6265), cookie domain (called cookie-domain in RFC 6265), cookie path
 // (called cookie-path in RFC 6265) and host-only-flag (see RFC 6265 section
 // 5.3). Cookies with same tuple (cookie-name, cookie-domain, cookie-path,
 // host-only-flag) as cookie that are already stored, will replace the stored
 // cookies.
 class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
  public:
-  typedef std::map<GURL, net::CookieList*> OriginCookieListMap;
+  typedef std::map<GURL, net::CookieHashSet*> OriginCookieListMap;

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

OriginCookieSetMap? Or is the current name generic enough?

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

I changed the name, as well as the names of the variables of that type.

 
   explicit CannedBrowsingDataCookieHelper(
       net::URLRequestContextGetter* request_context);
 
   // Return a copy of the cookie helper. Only one consumer can use the
   // StartFetching method at a time, so we need to create a copy of the helper
   // everytime we instantiate a cookies tree model for it.
   CannedBrowsingDataCookieHelper* Clone();
 
   // Adds the cookies from |cookie_list|. Current cookies that have the same
@@ skipping 36 matching lines @@
   // Returns the map that contains the cookie lists for all frame urls.
   const OriginCookieListMap& origin_cookie_list_map() {
     return origin_cookie_list_map_;
   }
 
  private:
   // Check if the cookie list contains a cookie with the same name,
   // domain, and path as the newly created cookie. Delete the old cookie
   // if does.
   bool DeleteMatchingCookie(const net::CanonicalCookie& add_cookie,
-                            net::CookieList* cookie_list);
+                            net::CookieHashSet* cookie_list);
 
   virtual ~CannedBrowsingDataCookieHelper();
 
   // Returns the |CookieList| for the given |origin|.
-  net::CookieList* GetCookiesFor(const GURL& origin);
+  net::CookieHashSet* GetCookiesFor(const GURL& origin);
 
   // Adds the |cookie| to the cookie list for the given |frame_url|.
   void AddCookie(const GURL& frame_url,
                  const net::CanonicalCookie& cookie);
 
   // Map that contains the cookie lists for all frame origins.
   OriginCookieListMap origin_cookie_list_map_;
 
+  // A cache of the url for the global cookie list.
+  GURL origin_cookie_url_;

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

Huh? Why do this? This is used in one place; suggestion there.

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataCookieHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_