Merge "Make CookieSyncManagerTest use stricter cookie format."