Roll DEPS and fix build bustage. Propagate rename of policyBaseURL -> firstPartyForCookies a bit further.

TBR=darin
TEST=It complies!
BUG=None

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

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

5 files changed, 10 insertions, 18 deletions

diff --git a/DEPS b/DEPS
index a17e9a5..89fcd20 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "44049",
+  "webkit_revision": "44065",
 }
 
 
diff --git a/webkit/api/public/WebURLRequest.h b/webkit/api/public/WebURLRequest.h
index 5728eb6..c7b9bec 100644
--- a/webkit/api/public/WebURLRequest.h
+++ b/webkit/api/public/WebURLRequest.h
@@ -76,8 +76,8 @@ namespace WebKit {
         WEBKIT_API void setURL(const WebURL&) = 0;
 
         // Used to implement third-party cookie blocking.
-        WEBKIT_API WebURL policyBaseURL() const = 0;
-        WEBKIT_API void setPolicyBaseURL(const WebURL&) = 0;
+        WEBKIT_API WebURL firstPartyForCookies() const = 0;
+        WEBKIT_API void setFirstPartyForCookies(const WebURL&) = 0;
 
         WEBKIT_API CachePolicy cachePolicy() const = 0;
         WEBKIT_API void setCachePolicy(CachePolicy) = 0;
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index 38e2d3a..5469747 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -123,15 +123,17 @@ void ChromiumBridge::clipboardWriteImage(const NativeImageSkia* image,
 
 // Cookies --------------------------------------------------------------------
 
-void ChromiumBridge::setCookies(const KURL& url, const KURL& policyURL,
+void ChromiumBridge::setCookies(const KURL& url,
+                                const KURL& firstPartyForCookies,
                                 const String& cookie)
 {
-    webKitClient()->setCookies(url, policyURL, cookie);
+    webKitClient()->setCookies(url, firstPartyForCookies, cookie);
 }
 
-String ChromiumBridge::cookies(const KURL& url, const KURL& policyURL)
+String ChromiumBridge::cookies(const KURL& url,
+                               const KURL& firstPartyForCookies)
 {
-    return webKitClient()->cookies(url, policyURL);
+    return webKitClient()->cookies(url, firstPartyForCookies);
 }
 
 // DNS ------------------------------------------------------------------------
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc
index 50541cb..1912094 100644
--- a/webkit/glue/resource_handle_impl.cc
+++ b/webkit/glue/resource_handle_impl.cc
@@ -423,7 +423,7 @@ bool ResourceHandleInternal::Start(
   bridge_.reset(ResourceLoaderBridge::Create(
       webkit_glue::CStringToStdString(method),
       url,
-      webkit_glue::KURLToGURL(request_.policyURL()),
+      webkit_glue::KURLToGURL(request_.firstPartyForCookies()),
       referrer,
       frame_origin,
       main_frame_origin,
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index c3dd259..749d659 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -218,16 +218,6 @@ void WebFrameLoaderClient::dispatchWillSendRequest(
     request.setTargetType(DetermineTargetTypeFromLoader(loader));
   }
 
-  // Inherit the policy URL from the request's frame. However, if the request
-  // is for a main frame, the current document's policyBaseURL is the old
-  // document, so we leave policyURL empty to indicate that the request is a
-  // first-party request.
-  if (request.targetType() != ResourceRequest::TargetIsMainFrame &&
-      webframe_->frame()->document()) {
-    request.setPolicyURL(
-        webframe_->frame()->document()->firstPartyForCookies());
-  }
-
   // FrameLoader::loadEmptyDocumentSynchronously() creates an empty document
   // with no URL.  We don't like that, so we'll rename it to about:blank.
   if (request.url().isEmpty())