X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fcontent_settings%2Flocal_shared_objects_container.cc;h=51b3d1b31dfb0e68be30bb7b6b309cde2a0b9228;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=2b5a8bdef63591d6aefda1235691811bd4bc71bf;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/content_settings/local_shared_objects_container.cc b/src/chrome/browser/content_settings/local_shared_objects_container.cc
index 2b5a8bd..51b3d1b 100644
--- a/src/chrome/browser/content_settings/local_shared_objects_container.cc
+++ b/src/chrome/browser/content_settings/local_shared_objects_container.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h"
+#include "chrome/browser/browsing_data/canonical_cookie_hash.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/storage_partition.h"
@@ -86,16 +87,15 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
   // to be a third party regarding the domain of the provided |origin|.
   // E.g. if the origin is "http://foo.com" then all cookies with domain foo.com,
   // a.foo.com, b.a.foo.com or *.foo.com will be counted.
-  typedef CannedBrowsingDataCookieHelper::OriginCookieListMap
-      OriginCookieListMap;
-  const OriginCookieListMap& origin_cookies_list_map =
-      cookies()->origin_cookie_list_map();
-  for (OriginCookieListMap::const_iterator it =
-          origin_cookies_list_map.begin();
-      it != origin_cookies_list_map.end();
-      ++it) {
-    const net::CookieList* cookie_list = it->second;
-    for (net::CookieList::const_iterator cookie = cookie_list->begin();
+  typedef CannedBrowsingDataCookieHelper::OriginCookieSetMap OriginCookieSetMap;
+  const OriginCookieSetMap& origin_cookies_set_map =
+      cookies()->origin_cookie_set_map();
+  for (OriginCookieSetMap::const_iterator it = origin_cookies_set_map.begin();
+       it != origin_cookies_set_map.end();
+       ++it) {
+    const canonical_cookie::CookieHashSet* cookie_list = it->second;
+    for (canonical_cookie::CookieHashSet::const_iterator cookie =
+             cookie_list->begin();
          cookie != cookie_list->end();
          ++cookie) {
       // Strip leading '.'s.