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

4 files changed, 29 insertions, 23 deletions

diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 62771ed..6da1489 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -96,7 +96,7 @@ bool EnsureIOThread() {
 struct RequestParams {
   std::string method;
   GURL url;
-  GURL policy_url;
+  GURL first_party_for_cookies;
   GURL referrer;
   std::string headers;
   int load_flags;
@@ -202,7 +202,7 @@ class RequestProxy : public URLRequest::Delegate,
   void AsyncStart(RequestParams* params) {
     request_.reset(new URLRequest(params->url, this));
     request_->set_method(params->method);
-    request_->set_policy_url(params->policy_url);
+    request_->set_first_party_for_cookies(params->first_party_for_cookies);
     request_->set_referrer(params->referrer.spec());
     request_->SetExtraRequestHeaders(params->headers);
     request_->set_load_flags(params->load_flags);
@@ -427,7 +427,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
  public:
   ResourceLoaderBridgeImpl(const std::string& method,
                            const GURL& url,
-                           const GURL& policy_url,
+                           const GURL& first_party_for_cookies,
                            const GURL& referrer,
                            const std::string& headers,
                            int load_flags,
@@ -436,7 +436,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
         proxy_(NULL) {
     params_->method = method;
     params_->url = url;
-    params_->policy_url = policy_url;
+    params_->first_party_for_cookies = first_party_for_cookies;
     params_->referrer = referrer;
     params_->headers = headers;
     params_->load_flags = load_flags;
@@ -566,7 +566,7 @@ namespace webkit_glue {
 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,
@@ -576,7 +576,7 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
     ResourceType::Type request_type,
     int app_cache_context_id,
     int routing_id) {
-  return new ResourceLoaderBridgeImpl(method, url, policy_url,
+  return new ResourceLoaderBridgeImpl(method, url, first_party_for_cookies,
                                       referrer, headers, load_flags,
                                       app_cache_context_id);
 }
@@ -627,8 +627,9 @@ void SimpleResourceLoaderBridge::Shutdown() {
   }
 }
 
-void SimpleResourceLoaderBridge::SetCookie(
-    const GURL& url, const GURL& policy_url, const std::string& cookie) {
+void SimpleResourceLoaderBridge::SetCookie(const GURL& url,
+                                           const GURL& first_party_for_cookies,
+                                           const std::string& cookie) {
   // Proxy to IO thread to synchronize w/ network loading.
 
   if (!EnsureIOThread()) {
@@ -642,7 +643,7 @@ void SimpleResourceLoaderBridge::SetCookie(
 }
 
 std::string SimpleResourceLoaderBridge::GetCookies(
-    const GURL& url, const GURL& policy_url) {
+    const GURL& url, const GURL& first_party_for_cookies) {
   // Proxy to IO thread to synchronize w/ network loading
 
   if (!EnsureIOThread()) {
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.h b/webkit/tools/test_shell/simple_resource_loader_bridge.h
index 47ff223..24df90c 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.h
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.h
@@ -28,10 +28,11 @@ class SimpleResourceLoaderBridge {
   static void Shutdown();
 
   // May only be called after Init.
-  static void SetCookie(
-      const GURL& url, const GURL& policy_url, const std::string& cookie);
-  static std::string GetCookies(
-      const GURL& url, const GURL& policy_url);
+  static void SetCookie(const GURL& url,
+                        const GURL& first_party_for_cookies,
+                        const std::string& cookie);
+  static std::string GetCookies(const GURL& url,
+                                const GURL& first_party_for_cookies);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index fe00c3d..ae6a9f1 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -71,15 +71,18 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
     return false;
   }
 
-  virtual void setCookies(
-      const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
-      const WebKit::WebString& value) {
-    SimpleResourceLoaderBridge::SetCookie(url, policy_url, UTF16ToUTF8(value));
+  virtual void setCookies(const WebKit::WebURL& url,
+                          const WebKit::WebURL& first_party_for_cookies,
+                          const WebKit::WebString& value) {
+    SimpleResourceLoaderBridge::SetCookie(
+        url, first_party_for_cookies, UTF16ToUTF8(value));
   }
 
   virtual WebKit::WebString cookies(
-      const WebKit::WebURL& url, const WebKit::WebURL& policy_url) {
-    return UTF8ToUTF16(SimpleResourceLoaderBridge::GetCookies(url, policy_url));
+      const WebKit::WebURL& url,
+      const WebKit::WebURL& first_party_for_cookies) {
+    return UTF8ToUTF16(SimpleResourceLoaderBridge::GetCookies(
+        url, first_party_for_cookies));
   }
 
   virtual void prefetchHostName(const WebKit::WebString&) {
diff --git a/webkit/tools/test_shell/test_worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc
index 50185b9..366b217 100644
--- a/webkit/tools/test_shell/test_worker/test_worker_main.cc
+++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc
@@ -60,13 +60,14 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   }
 
   virtual void setCookies(const WebKit::WebURL& url,
-                          const WebKit::WebURL& policy_url,
+                          const WebKit::WebURL& first_party_for_cookies,
                           const WebKit::WebString& value) {
     NOTREACHED();
   }
 
-  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) {
     NOTREACHED();
     return WebKit::WebString();
   }
@@ -122,7 +123,7 @@ __attribute__((visibility("default")))
 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,