Changed type CookieList to being a vector CanonicalCookies.

Originally, it was a vector of pair<domain_string, CanonicalCookie>.

TEST=Refactor; all relevant unit tests should still pass.
BUG=8850

Review URL: http://codereview.chromium.org/2799057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53184 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_cookies_helpers.h b/chrome/browser/extensions/extension_cookies_helpers.h
index 77284c6..a06621f 100644
--- a/chrome/browser/extensions/extension_cookies_helpers.h
+++ b/chrome/browser/extensions/extension_cookies_helpers.h
@@ -35,7 +35,7 @@ const char* GetStoreIdFromProfile(Profile* profile);
 // allocates a new DictionaryValue object; the caller is responsible for
 // freeing it.
 DictionaryValue* CreateCookieValue(
-    const net::CookieMonster::CookieListPair& cookie_pair,
+    const net::CookieMonster::CanonicalCookie& cookie,
     const std::string& store_id);
 
 // Constructs a CookieStore object as defined by the cookies API. This function
@@ -54,8 +54,8 @@ net::CookieMonster::CookieList GetCookieListFromStore(
 // a cookie against the extension's host permissions. The Secure
 // property of the cookie defines the URL scheme, and the cookie's
 // domain becomes the URL host.
-GURL GetURLFromCookiePair(
-    const net::CookieMonster::CookieListPair& cookie_pair);
+GURL GetURLFromCanonicalCookie(
+    const net::CookieMonster::CanonicalCookie& cookie);
 
 // Looks through all cookies in the given cookie store, and appends to the
 // match list all the cookies that both match the given URL and cookie details
@@ -86,7 +86,7 @@ class MatchFilter {
 
   // Returns true if the given cookie matches the properties in the match
   // filter.
-  bool MatchesCookie(const net::CookieMonster::CookieListPair& cookie_pair);
+  bool MatchesCookie(const net::CookieMonster::CanonicalCookie& cookie);
 
  private:
   // Returns true if the details dictionary contains a string with the given