Revert 164733 - Merge 164709 - Don't use CanonicalCookie::Create method for creating canonical cook…

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 50 matching lines @@
     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.gmail.google.com"), "B=1", net::CookieOptions(),
         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;
     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());
 
     ASSERT_TRUE(++it != cookies.end());
     EXPECT_EQ("www.gmail.google.com", it->Domain());
     EXPECT_EQ("B", it->Name());
 
     ASSERT_TRUE(++it == cookies.end());
     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();
 
     ASSERT_TRUE(it != cookies.end());
     EXPECT_EQ("www.gmail.google.com", it->Domain());
     EXPECT_EQ("B", it->Name());
 
     ASSERT_TRUE(++it == cookies.end());
     MessageLoop::current()->Quit();
   }
 
   void CannedUniqueCallback(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());
 
     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());
   }
 
  protected:
   MessageLoop message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
   scoped_ptr<TestingProfile> testing_profile_;
 
   net::CookieList cookie_list_;
 };
 
 TEST_F(BrowsingDataCookieHelperTest, FetchData) {
   CreateCookiesForTest();
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
       new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::FetchCallback,
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
   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(
       new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::FetchCallback,
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
   MessageLoop::current()->Run();
 
   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, 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;
 
   scoped_refptr<CannedBrowsingDataCookieHelper> helper(
       new CannedBrowsingDataCookieHelper(
           testing_profile_->GetRequestContext()));
 
   ASSERT_TRUE(helper->empty());
   helper->AddChangedCookie(origin, origin, "A=1", net::CookieOptions());
@@ skipping 74 matching lines @@
   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