diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 17:25:38 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 17:25:38 +0000 |
| commit | c58030205f55b793ec6cedbaa1967ccc4a9f3465 (patch) | |
| tree | 165cadae761d963560a4c55a510d9c637390ad29 /chrome/browser/gtk/options/cookies_view_unittest.cc | |
| parent | 001774129509b18784637bb8569cf9b090388797 (diff) | |
| download | chromium_src-c58030205f55b793ec6cedbaa1967ccc4a9f3465.zip chromium_src-c58030205f55b793ec6cedbaa1967ccc4a9f3465.tar.gz chromium_src-c58030205f55b793ec6cedbaa1967ccc4a9f3465.tar.bz2 | |
Change, unify, and specify ordering of cookies from CookieMonster.
Affected interfaces:
* GetCookiesWithOptions (used by HTTP requests)
* GetAllCookiesForURL (used by extensions and Cookies UI)
* GetAllCookies (used by Cookies UI).
BUG=8850 (indirectly)
TEST=Standard cookie monster tests, unit_tests::CookiesTreeModelTest.OriginOrdering, browser_tests::ExtensionApiTest.Cookies
Review URL: http://codereview.chromium.org/3170034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/cookies_view_unittest.cc')
| -rw-r--r-- | chrome/browser/gtk/options/cookies_view_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/gtk/options/cookies_view_unittest.cc b/chrome/browser/gtk/options/cookies_view_unittest.cc index 903fe25..a32d5f4 100644 --- a/chrome/browser/gtk/options/cookies_view_unittest.cc +++ b/chrome/browser/gtk/options/cookies_view_unittest.cc @@ -1013,7 +1013,8 @@ TEST_F(CookiesViewTest, FilterRemove) { "host1,_Local Storage,__http://host1:1/," "host2,_Local Storage,__http://host2:2/", GetDisplayedCookies(cookies_view).c_str()); - EXPECT_STREQ("D,A,E,C,B", GetMonsterCookies(monster).c_str()); + // All default paths; order will be creation time. + EXPECT_STREQ("C,D,B,A,E", GetMonsterCookies(monster).c_str()); EXPECT_EQ(FALSE, GTK_WIDGET_SENSITIVE(cookies_view.filter_clear_button_)); @@ -1053,7 +1054,7 @@ TEST_F(CookiesViewTest, FilterRemove) { { SCOPED_TRACE("First selection removed"); - EXPECT_STREQ("D,E,C,B", GetMonsterCookies(monster).c_str()); + EXPECT_STREQ("C,D,B,E", GetMonsterCookies(monster).c_str()); EXPECT_STREQ("bar0,_Cookies,__D," "bar1,+Cookies,++E", GetDisplayedCookies(cookies_view).c_str()); @@ -1067,7 +1068,7 @@ TEST_F(CookiesViewTest, FilterRemove) { { SCOPED_TRACE("Second selection"); - EXPECT_STREQ("D,C,B", GetMonsterCookies(monster).c_str()); + EXPECT_STREQ("C,D,B", GetMonsterCookies(monster).c_str()); EXPECT_STREQ("bar0,_Cookies,__D", GetDisplayedCookies(cookies_view).c_str()); EXPECT_EQ(TRUE, GTK_WIDGET_SENSITIVE(cookies_view.remove_all_button_)); |