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

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index de317b6..7a79917 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -569,15 +569,15 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {
 
   {
     SCOPED_TRACE("Initial State 8 cookies");
-    // D starts with a ., CookieMonster orders that lexicographically first
-    EXPECT_STREQ("D,E,A,C,F,B,G,H", GetMonsterCookies(monster).c_str());
+    // CookieMonster orders cookies by pathlength, then by creation time.
+    // All paths are length 1.
+    EXPECT_STREQ("A,B,C,D,E,F,G,H", GetMonsterCookies(monster).c_str());
     EXPECT_STREQ("F,E,C,B,A,G,D,H",
         GetDisplayedCookies(&cookies_model).c_str());
   }
   DeleteStoredObjects(cookies_model.GetRoot()->GetChild(1));  // Delete "E"
   {
-    SCOPED_TRACE("Second origin removed");
-    EXPECT_STREQ("D,A,C,F,B,G,H", GetMonsterCookies(monster).c_str());
+    EXPECT_STREQ("A,B,C,D,F,G,H", GetMonsterCookies(monster).c_str());
     EXPECT_STREQ("F,C,B,A,G,D,H", GetDisplayedCookies(&cookies_model).c_str());
   }
 }