Rename |policy_url| to |first_party_for_cookies|. This now matches the WebKit name for this piece of data.

R=jackson
BUG=None
TEST=No behavior change

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

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

5 files changed, 18 insertions, 17 deletions

diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index d0925a22..e5fddd3 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -215,7 +215,7 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
 ResourceLoaderBridge* ResourceLoaderBridge::Create(
     const std::string& method,
     const GURL& url,
-    const GURL& policy_url,
+    const GURL& first_party_for_cookies,
     const GURL& referrer,
     const std::string& frame_origin,
     const std::string& main_frame_origin,
@@ -226,7 +226,7 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
     int app_cache_context_id,
     int routing_id) {
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
-  return dispatch->CreateBridge(method, url, policy_url, referrer,
+  return dispatch->CreateBridge(method, url, first_party_for_cookies, referrer,
                                 frame_origin, main_frame_origin, headers,
                                 load_flags, origin_pid, resource_type, 0,
                                 app_cache_context_id, routing_id);
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 5e7d0bb..408ddef 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -48,19 +48,20 @@ bool RendererWebKitClientImpl::isLinkVisited(unsigned long long link_hash) {
   return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
 }
 
-void RendererWebKitClientImpl::setCookies(
-    const WebURL& url, const WebURL& policy_url, const WebString& value) {
+void RendererWebKitClientImpl::setCookies(const WebURL& url,
+                                          const WebURL& first_party_for_cookies,
+                                          const WebString& value) {
   std::string value_utf8;
   UTF16ToUTF8(value.data(), value.length(), &value_utf8);
   RenderThread::current()->Send(
-      new ViewHostMsg_SetCookie(url, policy_url, value_utf8));
+      new ViewHostMsg_SetCookie(url, first_party_for_cookies, value_utf8));
 }
 
 WebString RendererWebKitClientImpl::cookies(
-    const WebURL& url, const WebURL& policy_url) {
+    const WebURL& url, const WebURL& first_party_for_cookies) {
   std::string value_utf8;
   RenderThread::current()->Send(
-      new ViewHostMsg_GetCookies(url, policy_url, &value_utf8));
+      new ViewHostMsg_GetCookies(url, first_party_for_cookies, &value_utf8));
   return WebString::fromUTF8(value_utf8);
 }
 
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 2e43515..3150b12 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -22,11 +22,11 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual unsigned long long visitedLinkHash(
       const char* canonicalURL, size_t length);
   virtual bool isLinkVisited(unsigned long long linkHash);
-  virtual void setCookies(
-      const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
-      const WebKit::WebString&);
+  virtual void setCookies(const WebKit::WebURL& url,
+                          const WebKit::WebURL& first_party_for_cookies,
+                          const WebKit::WebString&);
   virtual WebKit::WebString cookies(
-      const WebKit::WebURL& url, const WebKit::WebURL& policy_url);
+      const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies);
   virtual void prefetchHostName(const WebKit::WebString&);
   virtual WebKit::WebString defaultLocale();
   virtual void suddenTerminationChanged(bool enabled);
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 86424eb..2ae6ec4 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -715,18 +715,18 @@ void WebPluginDelegateProxy::OnGetPluginElement(
 }
 
 void WebPluginDelegateProxy::OnSetCookie(const GURL& url,
-                                         const GURL& policy_url,
+                                         const GURL& first_party_for_cookies,
                                          const std::string& cookie) {
   if (plugin_)
-    plugin_->SetCookie(url, policy_url, cookie);
+    plugin_->SetCookie(url, first_party_for_cookies, cookie);
 }
 
 void WebPluginDelegateProxy::OnGetCookies(const GURL& url,
-                                          const GURL& policy_url,
+                                          const GURL& first_party_for_cookies,
                                           std::string* cookies) {
   DCHECK(cookies);
   if (plugin_)
-    *cookies = plugin_->GetCookies(url, policy_url);
+    *cookies = plugin_->GetCookies(url, first_party_for_cookies);
 }
 
 void WebPluginDelegateProxy::OnShowModalHTMLDialog(
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index b554aa9..2ab9e20 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -121,9 +121,9 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
                                  intptr_t* npobject_ptr);
   void OnGetPluginElement(int route_id, bool* success, intptr_t* npobject_ptr);
   void OnSetCookie(const GURL& url,
-                   const GURL& policy_url,
+                   const GURL& first_party_for_cookies,
                    const std::string& cookie);
-  void OnGetCookies(const GURL& url, const GURL& policy_url,
+  void OnGetCookies(const GURL& url, const GURL& first_party_for_cookies,
                     std::string* cookies);
   void OnShowModalHTMLDialog(const GURL& url, int width, int height,
                              const std::string& json_arguments,