Make the BrowsingDataCookieHelper create canonical cookies with the correct cookie-domain attribute.

chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.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 "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 92 matching lines @@
     cookie_list_ = cookies;
     net::CookieList::const_iterator it = cookies.begin();
 
     ASSERT_TRUE(it != cookies.end());
     EXPECT_EQ("http://www.google.com/", it->Source());
     EXPECT_EQ("A", it->Name());
 
     ASSERT_TRUE(++it == cookies.end());
   }
 
+  void CannedDomainCallback(const net::CookieList& cookies) {
+    ASSERT_EQ(1UL, cookies.size());
+    cookie_list_ = cookies;
+    net::CookieList::const_iterator it = cookies.begin();
+
+    ASSERT_TRUE(it != cookies.end());
+    EXPECT_EQ("http://www.google.com/", it->Source());
+    EXPECT_EQ("A", it->Name());
+    EXPECT_EQ("www.google.com", it->Domain());
+
+    ASSERT_TRUE(++it == cookies.end());
+  }
+
   void CannedDifferentFramesCallback(const net::CookieList& cookie_list) {
     ASSERT_EQ(3U, cookie_list.size());
   }
 
  protected:
   MessageLoop message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
   scoped_ptr<TestingProfile> testing_profile_;
 
@@ skipping 27 matching lines @@
 
   net::CanonicalCookie cookie = cookie_list_[0];
   cookie_helper->DeleteCookie(cookie);
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::DeleteCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
 }
 
+TEST_F(BrowsingDataCookieHelperTest, CannedCookieDomain) {

[jochen (gone - plz use gerrit), 2012/10/29 16:29:48]

can you add a test where you feed the same cookie line into a cookie monster and
into the cookie helper, and then check that the cookies match?

[markusheintz_, 2012/10/29 18:13:00]

Done.

+  const GURL origin("http://www.google.com");
+  net::CookieList cookie;
+
+  scoped_refptr<CannedBrowsingDataCookieHelper> helper(
+      new CannedBrowsingDataCookieHelper(
+          testing_profile_->GetRequestContext()));
+
+  ASSERT_TRUE(helper->empty());
+  helper->AddChangedCookie(origin, origin, "A=1", net::CookieOptions());
+  helper->StartFetching(
+      base::Bind(&BrowsingDataCookieHelperTest::CannedDomainCallback,
+                 base::Unretained(this)));
+  cookie = cookie_list_;
+
+  helper->Reset();
+  ASSERT_TRUE(helper->empty());
+
+  helper->AddReadCookies(origin, origin, cookie);
+  helper->StartFetching(
+      base::Bind(&BrowsingDataCookieHelperTest::CannedDomainCallback,
+                 base::Unretained(this)));
+}
+
+
+
 TEST_F(BrowsingDataCookieHelperTest, CannedUnique) {
   const GURL origin("http://www.google.com");
   net::CookieList cookie;
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
       new CannedBrowsingDataCookieHelper(
           testing_profile_->GetRequestContext()));
 
   ASSERT_TRUE(helper->empty());
   helper->AddChangedCookie(origin, origin, "A=1", net::CookieOptions());
@@ skipping 54 matching lines @@
                            net::CookieOptions());
   helper->AddChangedCookie(frame2_url, request_url, "c=1",
                            net::CookieOptions());
 
   helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::CannedDifferentFramesCallback,
                  base::Unretained(this)));
 }
 
 }  // namespace