diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:19:15 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:19:15 +0000 |
commit | c7a90eab2f4a045fee103dbfa18710918b368476 (patch) | |
tree | e12ebddacb41a61bb804deff42a504b0361f5544 /net/base/cookie_monster_unittest.cc | |
parent | 97cdd4667b961cf865047d0bc764764a7c199ce7 (diff) | |
download | chromium_src-c7a90eab2f4a045fee103dbfa18710918b368476.zip chromium_src-c7a90eab2f4a045fee103dbfa18710918b368476.tar.gz chromium_src-c7a90eab2f4a045fee103dbfa18710918b368476.tar.bz2 |
Modify CookiePolicy to work asynchronously
This change will enable us to prompt the user before setting a cookie. While we only need to prompt before setting, we actually need to make both CanSetCookie and CanGetCookies asynchronous. This is necessary in order to preserve FIFO ordering since the value returned by GetCookies depends on the changes made to the cookie DB by SetCookie.
This change also includes some simplification of CookieStore. Instead of N virtual functions, I distilled it down to only 4. The remaining functions are instead expressed in terms of those.
While studying all the places where we currently use CookiePolicy, I found that some of them were not appropriate. After discussing with Amit, I decided to remove the policy checks in URLRequestAutomationJob. See the comments in the code regarding this.
I changed the signature of CookieMonster::GetRawCookies to GetAllCookiesForURL to better match GetAllCookies. I also filed a bug about making it even closer in functionality. Related to this change webkit/glue/webcookie.h grows a constructor that takes a CanonicalCookie to help clean up some code.
On the Chrome side, ChromeURLRequestContext now has a ChromeCookiePolicy object. That object is thread-safe ref counted because it is passed between the UI and IO threads. It is responsible for implementing the queuing logic described above. It will also in the future trigger the Chrome UI code to actually show the set-cookie prompt.
Please review the state machinery changes in URLRequestHttpJob carefully.
R=eroman
BUG=34331
TEST=no tests yet for prompting.
Review URL: http://codereview.chromium.org/567015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cookie_monster_unittest.cc')
-rw-r--r-- | net/base/cookie_monster_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc index ba645ee..cdbf869 100644 --- a/net/base/cookie_monster_unittest.cc +++ b/net/base/cookie_monster_unittest.cc @@ -961,7 +961,7 @@ TEST(CookieMonsterTest, SetCookieableSchemes) { EXPECT_FALSE(cm_foo->SetCookie(http_url, "x=1")); } -TEST(CookieMonsterTest, GetRawCookies) { +TEST(CookieMonsterTest, GetAllCookiesForURL) { GURL url_google(kUrlGoogle); GURL url_google_secure(kUrlGoogleSecure); @@ -985,7 +985,8 @@ TEST(CookieMonsterTest, GetRawCookies) { PlatformThread::Sleep(kLastAccessThresholdMilliseconds + 20); // Check raw cookies. - net::CookieMonster::CookieList raw_cookies = cm->GetRawCookies(url_google); + net::CookieMonster::CookieList raw_cookies = + cm->GetAllCookiesForURL(url_google); net::CookieMonster::CookieList::iterator it = raw_cookies.begin(); ASSERT_TRUE(it != raw_cookies.end()); @@ -999,7 +1000,7 @@ TEST(CookieMonsterTest, GetRawCookies) { ASSERT_TRUE(++it == raw_cookies.end()); // Test secure cookies. - raw_cookies = cm->GetRawCookies(url_google_secure); + raw_cookies = cm->GetAllCookiesForURL(url_google_secure); it = raw_cookies.begin(); ASSERT_TRUE(it != raw_cookies.end()); |