diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-13 16:48:45 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-20 16:28:03 +0100 |
| commit | e3ea42dbe72fb01590e098d40bef2c41463ced81 (patch) | |
| tree | 3f2afc504b8b7731ef4bcd1c22652c2c723f5fbb /Source | |
| parent | d02f0d2d9fb7ecc40c1901a88130f5d085ca5c71 (diff) | |
| download | external_webkit-e3ea42dbe72fb01590e098d40bef2c41463ced81.zip external_webkit-e3ea42dbe72fb01590e098d40bef2c41463ced81.tar.gz external_webkit-e3ea42dbe72fb01590e098d40bef2c41463ced81.tar.bz2 | |
Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonster
Upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/jni/CookieManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/CookieManager.cpp b/Source/WebKit/android/jni/CookieManager.cpp index 0bdf303..f8c2dee 100644 --- a/Source/WebKit/android/jni/CookieManager.cpp +++ b/Source/WebKit/android/jni/CookieManager.cpp @@ -110,8 +110,8 @@ static void removeSessionCookies(WebCookieJar* cookieJar) { #if USE(CHROME_NETWORK_STACK) CookieMonster* cookieMonster = cookieJar->cookieStore()->GetCookieMonster(); - CookieMonster::CookieList cookies = cookieMonster->GetAllCookies(); - for (CookieMonster::CookieList::const_iterator iter = cookies.begin(); iter != cookies.end(); ++iter) { + CookieList cookies = cookieMonster->GetAllCookies(); + for (CookieList::const_iterator iter = cookies.begin(); iter != cookies.end(); ++iter) { if (iter->IsSessionCookie()) cookieMonster->DeleteCanonicalCookie(*iter); } |