DevTools: CookieMonster::GetRawCookies should return keys as well as cookies.

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

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

2 files changed, 17 insertions, 17 deletions

diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index df32cc2..319b976 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -330,11 +330,11 @@ void URLRequestAutomationJob::OnRequestStarted(int tab, int id,
           url_for_cookies, request_->first_party_for_cookies()))) {
     StringTokenizer cookie_parser(response.persistent_cookies, ";");
 
-    std::vector<net::CookieMonster::CanonicalCookie> existing_cookies;
+    net::CookieMonster::CookieList existing_cookies;
     net::CookieMonster* monster = ctx->cookie_store()->GetCookieMonster();
     DCHECK(monster);
     if (monster) {
-      monster->GetRawCookies(url_for_cookies, &existing_cookies);
+      existing_cookies = monster->GetRawCookies(url_for_cookies);
     }
 
     while (cookie_parser.GetNext()) {
@@ -350,9 +350,9 @@ void URLRequestAutomationJob::OnRequestStarted(int tab, int id,
         // Ignore duplicate cookies, i.e. cookies passed in from the host
         // browser which also exist in the response header.
         net::CookieMonster::ParsedCookie parsed_cookie(cookie_string);
-        std::vector<net::CookieMonster::CanonicalCookie>::const_iterator i;
+        net::CookieMonster::CookieList::const_iterator i;
         for (i = existing_cookies.begin(); i != existing_cookies.end(); ++i) {
-          if ((*i).Name() == parsed_cookie.Name())
+          if (i->second.Name() == parsed_cookie.Name())
             break;
         }
 
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 7979b3f..1bcb7a7 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -519,21 +519,21 @@ void ResourceMessageFilter::OnGetRawCookies(
   if (!context->cookie_policy()->CanGetCookies(url, first_party_for_cookies))
     return;
 
-  typedef std::vector<net::CookieMonster::CanonicalCookie> CanonicalCookieList;
-  CanonicalCookieList cookies;
-  cookie_monster->GetRawCookies(url, &cookies);
-  for (CanonicalCookieList::iterator it = cookies.begin();
-       it != cookies.end(); ++it) {
+  typedef net::CookieMonster::CookieList CookieList;
+  CookieList cookieList = cookie_monster->GetRawCookies(url);
+  for (CookieList::iterator it = cookieList.begin();
+       it != cookieList.end(); ++it) {
+     net::CookieMonster::CanonicalCookie& cookie = it->second;
      raw_cookies->push_back(
          webkit_glue::WebCookie(
-             it->Name(),
-             it->Value(),
-             url.host(),
-             it->Path(),
-             it->ExpiryDate().ToDoubleT() * 1000,
-             it->IsHttpOnly(),
-             it->IsSecure(),
-             !it->IsPersistent()));
+             cookie.Name(),
+             cookie.Value(),
+             it->first,
+             cookie.Path(),
+             cookie.ExpiryDate().ToDoubleT() * 1000,
+             cookie.IsHttpOnly(),
+             cookie.IsSecure(),
+             !cookie.IsPersistent()));
   }
 }