summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 20:32:22 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 20:32:22 +0000
commit37a5a1cbb9331f9353139c2fdae6da0645252a26 (patch)
treeb498e5a8381989a639b0c927945e59f46446cb4a
parente649f081014c41fe0b548e9f6eeb2abd94aac4a0 (diff)
downloadchromium_src-37a5a1cbb9331f9353139c2fdae6da0645252a26.zip
chromium_src-37a5a1cbb9331f9353139c2fdae6da0645252a26.tar.gz
chromium_src-37a5a1cbb9331f9353139c2fdae6da0645252a26.tar.bz2
Fix merge.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16788 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/weburlrequest_impl.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc
index 9954036..7e82ba9 100644
--- a/webkit/glue/weburlrequest_impl.cc
+++ b/webkit/glue/weburlrequest_impl.cc
@@ -49,13 +49,11 @@ void WebRequestImpl::SetURL(const GURL& url) {
}
GURL WebRequestImpl::GetFirstPartyForCookies() const {
- return webkit_glue::KURLToGURL(
- request_.resourceRequest().firstPartyForCookies());
+ return webkit_glue::KURLToGURL(request_.firstPartyForCookies());
}
void WebRequestImpl::SetFirstPartyForCookies(const GURL& url) {
- request_.resourceRequest().setFirstPartyForCookies(
- webkit_glue::GURLToKURL(url));
+ request_.setFirstPartyForCookies(webkit_glue::GURLToKURL(url));
}
WebRequestCachePolicy WebRequestImpl::GetCachePolicy() const {