Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browsing_data / browsing_data_cookie_helper.h

diff --git a/src/chrome/browser/browsing_data/browsing_data_cookie_helper.h b/src/chrome/browser/browsing_data/browsing_data_cookie_helper.h
index cefd2b5..a815a60 100644 (file)
--- a/src/chrome/browser/browsing_data/browsing_data_cookie_helper.h
+++ b/src/chrome/browser/browsing_data/browsing_data_cookie_helper.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "chrome/browser/browsing_data/canonical_cookie_hash.h"
 #include "net/cookies/cookie_monster.h"
 
 class GURL;
@@ -90,16 +91,11 @@ class BrowsingDataCookieHelper
 // cookies.
 class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
  public:
-  typedef std::map<GURL, net::CookieList*> OriginCookieListMap;
+  typedef std::map<GURL, canonical_cookie::CookieHashSet*> OriginCookieSetMap;
 
   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
   // cookie name, cookie domain, cookie path, host-only-flag tuple as passed
   // cookies are replaced by the passed cookies.
@@ -138,28 +134,28 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
   size_t GetCookieCount() const;
 
   // Returns the map that contains the cookie lists for all frame urls.
-  const OriginCookieListMap& origin_cookie_list_map() {
-    return origin_cookie_list_map_;
+  const OriginCookieSetMap& origin_cookie_set_map() {
+    return origin_cookie_set_map_;
   }
 
  private:
-  // Check if the cookie list contains a cookie with the same name,
+  // Check if the cookie set 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);
+                            canonical_cookie::CookieHashSet* cookie_set);
 
   virtual ~CannedBrowsingDataCookieHelper();
 
-  // Returns the |CookieList| for the given |origin|.
-  net::CookieList* GetCookiesFor(const GURL& origin);
+  // Returns the |CookieSet| for the given |origin|.
+  canonical_cookie::CookieHashSet* GetCookiesFor(const GURL& origin);
 
-  // Adds the |cookie| to the cookie list for the given |frame_url|.
+  // Adds the |cookie| to the cookie set 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_;
+  // Map that contains the cookie sets for all frame origins.
+  OriginCookieSetMap origin_cookie_set_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataCookieHelper);
 };