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

2 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/net/chrome_cookie_notification_details.h b/chrome/browser/net/chrome_cookie_notification_details.h
index a4ee4a0..e7b71dd 100644
--- a/chrome/browser/net/chrome_cookie_notification_details.h
+++ b/chrome/browser/net/chrome_cookie_notification_details.h
@@ -9,13 +9,13 @@
 
 struct ChromeCookieDetails {
  public:
-  ChromeCookieDetails(net::CookieMonster::CookieListPair* cookie_pair_copy,
+  ChromeCookieDetails(net::CookieMonster::CanonicalCookie* cookie_copy,
                       bool is_removed)
-      : cookie_pair(cookie_pair_copy),
+      : cookie(cookie_copy),
         removed(is_removed) {
   }
 
-  net::CookieMonster::CookieListPair* cookie_pair;
+  net::CookieMonster::CanonicalCookie* cookie;
   bool removed;
 };
 
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 27fc4d7..17197a4 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -133,14 +133,13 @@ class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate {
 
   // net::CookieMonster::Delegate implementation.
   virtual void OnCookieChanged(
-      const std::string& domain_key,
       const net::CookieMonster::CanonicalCookie& cookie,
       bool removed) {
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(this,
             &ChromeCookieMonsterDelegate::OnCookieChangedAsyncHelper,
-            net::CookieMonster::CookieListPair(domain_key, cookie),
+            cookie,
             removed));
   }
 
@@ -193,10 +192,10 @@ class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate {
   virtual ~ChromeCookieMonsterDelegate() {}
 
   void OnCookieChangedAsyncHelper(
-      net::CookieMonster::CookieListPair cookie_pair,
+      net::CookieMonster::CanonicalCookie cookie,
       bool removed) {
     if (profile_getter_->get()) {
-      ChromeCookieDetails cookie_details(&cookie_pair, removed);
+      ChromeCookieDetails cookie_details(&cookie, removed);
       NotificationService::current()->Notify(
           NotificationType::COOKIE_CHANGED,
           Source<Profile>(profile_getter_->get()),