summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 17:08:19 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 17:08:19 +0000
commit79a087a3332e71e674d954a868244f671ab22a22 (patch)
treefc785ea040d1d60e76b86f8df55da58d5116459b /chrome/browser/automation
parent84352455e708fc771809f34476d4db9ca79e4bc9 (diff)
downloadchromium_src-79a087a3332e71e674d954a868244f671ab22a22.zip
chromium_src-79a087a3332e71e674d954a868244f671ab22a22.tar.gz
chromium_src-79a087a3332e71e674d954a868244f671ab22a22.tar.bz2
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
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/url_request_automation_job.cc8
1 files changed, 4 insertions, 4 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;
}