Revert 164709 - Don't use CanonicalCookie::Create method for creating canonical cookies in the BrowsingDataCookieHelper. This results in wrong default values if no cookie-domain attribute is given in the cookie-string.

Revert reason - see bug 158448

BUG=158353

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

TBR=markusheintz@chromium.org
Review URL: https://codereview.chromium.org/11301030

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

2 files changed, 1 insertions, 90 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
index 88563a9..2ed116d 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
@@ -147,7 +147,7 @@ void CannedBrowsingDataCookieHelper::AddChangedCookie(
   // form cookie line and the url don't have the same domain+registry, or url
   // host isn't cookie domain or one of its subdomains.
   scoped_ptr<net::CanonicalCookie> cookie(
-      new net::CanonicalCookie(url, parsed_cookie));
+      net::CanonicalCookie::Create(url, parsed_cookie));
   if (cookie.get())
     AddCookie(frame_url, *cookie);
 }
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 0aaab16..652e0b1 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
@@ -68,17 +68,6 @@ class BrowsingDataCookieHelperTest : public testing::Test {
         net::CookieMonster::SetCookiesCallback());
   }
 
-  void CreateCookiesForDomainCookieTest() {
-    scoped_refptr<net::CookieMonster> cookie_monster =
-        testing_profile_->GetCookieMonster();
-    cookie_monster->SetCookieWithOptionsAsync(
-        GURL("http://www.google.com"), "A=1", net::CookieOptions(),
-        net::CookieMonster::SetCookiesCallback());
-    cookie_monster->SetCookieWithOptionsAsync(
-        GURL("http://www.google.com"), "A=2; Domain=.www.google.com ",
-        net::CookieOptions(), net::CookieMonster::SetCookiesCallback());
-  }
-
   void FetchCallback(const net::CookieList& cookies) {
     ASSERT_EQ(2UL, cookies.size());
     cookie_list_ = cookies;
@@ -97,26 +86,6 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     MessageLoop::current()->Quit();
   }
 
-  void DomainCookieCallback(const net::CookieList& cookies) {
-    ASSERT_EQ(2UL, cookies.size());
-    cookie_list_ = cookies;
-    net::CookieList::const_iterator it = cookies.begin();
-
-    // Correct because fetching cookies will get a sorted cookie list.
-    ASSERT_TRUE(it != cookies.end());
-    EXPECT_EQ("www.google.com", it->Domain());
-    EXPECT_EQ("A", it->Name());
-    EXPECT_EQ("1", it->Value());
-
-    ASSERT_TRUE(++it != cookies.end());
-    EXPECT_EQ(".www.google.com", it->Domain());
-    EXPECT_EQ("A", it->Name());
-    EXPECT_EQ("2", it->Value());
-
-    ASSERT_TRUE(++it == cookies.end());
-    MessageLoop::current()->Quit();
-  }
-
   void DeleteCallback(const net::CookieList& cookies) {
     ASSERT_EQ(1UL, cookies.size());
     net::CookieList::const_iterator it = cookies.begin();
@@ -141,24 +110,6 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     ASSERT_TRUE(++it == cookies.end());
   }
 
-  void CannedDomainCookieCallback(const net::CookieList& cookies) {
-    ASSERT_EQ(2UL, 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());
-    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());
   }
@@ -185,19 +136,6 @@ TEST_F(BrowsingDataCookieHelperTest, FetchData) {
   MessageLoop::current()->Run();
 }
 
-TEST_F(BrowsingDataCookieHelperTest, DomainCookie) {
-  CreateCookiesForDomainCookieTest();
-  scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
-      new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
-
-  cookie_helper->StartFetching(
-      base::Bind(&BrowsingDataCookieHelperTest::DomainCookieCallback,
-                 base::Unretained(this)));
-
-  // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
-  MessageLoop::current()->Run();
-}
-
 TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
   CreateCookiesForTest();
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
@@ -219,33 +157,6 @@ TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
   MessageLoop::current()->Run();
 }
 
-TEST_F(BrowsingDataCookieHelperTest, CannedDomainCookie) {
-  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->AddChangedCookie(origin, origin, "A=1; Domain=.www.google.com",
-                           net::CookieOptions());
-
-  helper->StartFetching(
-      base::Bind(&BrowsingDataCookieHelperTest::CannedDomainCookieCallback,
-                 base::Unretained(this)));
-  cookie = cookie_list_;
-
-  helper->Reset();
-  ASSERT_TRUE(helper->empty());
-
-  helper->AddReadCookies(origin, origin, cookie);
-  helper->StartFetching(
-      base::Bind(&BrowsingDataCookieHelperTest::CannedDomainCookieCallback,
-                 base::Unretained(this)));
-}
-
 TEST_F(BrowsingDataCookieHelperTest, CannedUnique) {
   const GURL origin("http://www.google.com");
   net::CookieList cookie;