Rename policy_url to first_party_for_cookies in cookie-related code.

R=abarth
BUG=25133
TEST=none. A cosmetic change.
Review URL: http://codereview.chromium.org/403011

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

6 files changed, 24 insertions, 18 deletions

diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
index a6d772a..4daf282 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
@@ -47,14 +47,16 @@ BrowserWebKitClientImpl::createMessagePortChannel() {
   return NULL;
 }
 
-void BrowserWebKitClientImpl::setCookies(const WebKit::WebURL& url,
-                                         const WebKit::WebURL& policy_url,
-                                         const WebKit::WebString& value) {
+void BrowserWebKitClientImpl::setCookies(
+    const WebKit::WebURL& url,
+    const WebKit::WebURL& first_party_for_cookies,
+    const WebKit::WebString& value) {
   NOTREACHED();
 }
 
 WebKit::WebString BrowserWebKitClientImpl::cookies(
-    const WebKit::WebURL& url, const WebKit::WebURL& policy_url) {
+    const WebKit::WebURL& url,
+    const WebKit::WebURL& first_party_for_cookies) {
   NOTREACHED();
   return WebKit::WebString();
 }
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
index dd4b401..0879cc8 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
@@ -19,10 +19,11 @@ class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual bool isLinkVisited(unsigned long long linkHash);
   virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
   virtual void setCookies(const WebKit::WebURL& url,
-                          const WebKit::WebURL& policy_url,
+                          const WebKit::WebURL& first_party_for_cookies,
                           const WebKit::WebString& value);
-  virtual WebKit::WebString cookies(const WebKit::WebURL& url,
-                                    const WebKit::WebURL& policy_url);
+  virtual WebKit::WebString cookies(
+      const WebKit::WebURL& url,
+      const WebKit::WebURL& first_party_for_cookies);
   virtual void prefetchHostName(const WebKit::WebString&);
   virtual WebKit::WebString defaultLocale();
   virtual WebKit::WebThemeEngine* themeEngine();
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 5033d8e..b6a6973 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -182,15 +182,17 @@ NPObject* WebPluginProxy::GetPluginElement() {
 }
 
 void WebPluginProxy::SetCookie(const GURL& url,
-                               const GURL& policy_url,
+                               const GURL& first_party_for_cookies,
                                const std::string& cookie) {
-  Send(new PluginHostMsg_SetCookie(route_id_, url, policy_url, cookie));
+  Send(new PluginHostMsg_SetCookie(route_id_, url,
+                                   first_party_for_cookies, cookie));
 }
 
 std::string WebPluginProxy::GetCookies(const GURL& url,
-                                       const GURL& policy_url) {
+                                       const GURL& first_party_for_cookies) {
   std::string cookies;
-  Send(new PluginHostMsg_GetCookies(route_id_, url, policy_url, &cookies));
+  Send(new PluginHostMsg_GetCookies(route_id_, url,
+                                    first_party_for_cookies, &cookies));
 
   return cookies;
 }
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index fbf88f6..7b283f6 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -53,9 +53,9 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
   NPObject* GetWindowScriptNPObject();
   NPObject* GetPluginElement();
   void SetCookie(const GURL& url,
-                 const GURL& policy_url,
+                 const GURL& first_party_for_cookies,
                  const std::string& cookie);
-  std::string GetCookies(const GURL& url, const GURL& policy_url);
+  std::string GetCookies(const GURL& url, const GURL& first_party_for_cookies);
 
   void ShowModalHTMLDialog(const GURL& url, int width, int height,
                            const std::string& json_arguments,
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 12ed15a..bb8bb04 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -57,13 +57,13 @@ WorkerWebKitClientImpl::createMessagePortChannel() {
 }
 
 void WorkerWebKitClientImpl::setCookies(const WebURL& url,
-                                        const WebURL& policy_url,
+                                        const WebURL& first_party_for_cookies,
                                         const WebString& value) {
   NOTREACHED();
 }
 
 WebString WorkerWebKitClientImpl::cookies(
-    const WebURL& url, const WebURL& policy_url) {
+    const WebURL& url, const WebURL& first_party_for_cookies) {
   NOTREACHED();
   return WebString();
 }
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index 23b75d8..32ab01d 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -21,10 +21,11 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl,
   virtual bool isLinkVisited(unsigned long long linkHash);
   virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
   virtual void setCookies(const WebKit::WebURL& url,
-                          const WebKit::WebURL& policy_url,
+                          const WebKit::WebURL& first_party_for_cookies,
                           const WebKit::WebString& value);
-  virtual WebKit::WebString cookies(const WebKit::WebURL& url,
-                                    const WebKit::WebURL& policy_url);
+  virtual WebKit::WebString cookies(
+      const WebKit::WebURL& url,
+      const WebKit::WebURL& first_party_for_cookies);
   virtual void prefetchHostName(const WebKit::WebString&);
   virtual bool getFileSize(const WebKit::WebString& path, long long& result);
   virtual WebKit::WebString defaultLocale();