For the cookie counts in the Website Settings UI: Don't count cookies that are sent to multiple hosts during redirects multiple times.

E.g.
Let "example.com" be redirected to "www.example.com" and then to"start.example.com". A cookie set with the cookie string "A=B; Domain=.example.com" would be sent to all tree hosts. If we keep separate buckets for each host in the redirect chain than we would collect the same cookie in multiple buckets and count it multiple times. Therefor use only a single list for collecting send cookies.

BUG=158353

Review URL: https://codereview.chromium.org/11340015

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

1 files changed, 20 insertions, 0 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
index 2b6d63a..0aaab16 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
@@ -319,4 +319,24 @@ TEST_F(BrowsingDataCookieHelperTest, CannedDifferentFrames) {
                  base::Unretained(this)));
 }
 
+TEST_F(BrowsingDataCookieHelperTest, CannedGetCookieCount) {
+  GURL frame1_url("http://www.google.com");
+  GURL frame2_url("http://www.google.de");
+  GURL request_url("http://res.google.com");
+  scoped_refptr<CannedBrowsingDataCookieHelper> helper(
+      new CannedBrowsingDataCookieHelper(
+          testing_profile_->GetRequestContext()));
+
+  EXPECT_EQ(0U, helper->GetCookieCount());
+  helper->AddChangedCookie(frame1_url, request_url, "a=1",
+                           net::CookieOptions());
+  EXPECT_EQ(1U, helper->GetCookieCount());
+  helper->AddChangedCookie(frame1_url, request_url, "b=1",
+                           net::CookieOptions());
+  EXPECT_EQ(2U, helper->GetCookieCount());
+  helper->AddChangedCookie(frame2_url, request_url, "a=2",
+                           net::CookieOptions());
+  EXPECT_EQ(2U, helper->GetCookieCount());
+}
+
 }  // namespace