diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 18:11:10 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 18:11:10 +0000 |
| commit | cfd7332188b64787a9cb2b110957c0eb60b806a8 (patch) | |
| tree | bd5072b446490dc3266dff44a627416f54404eb8 /chrome/browser | |
| parent | d62c805ec92a9e00bfd97fc5a4d35103a8e89380 (diff) | |
| download | chromium_src-cfd7332188b64787a9cb2b110957c0eb60b806a8.zip chromium_src-cfd7332188b64787a9cb2b110957c0eb60b806a8.tar.gz chromium_src-cfd7332188b64787a9cb2b110957c0eb60b806a8.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser')
4 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index cd5af7b..53dfe47 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -481,7 +481,7 @@ void PluginProcessHost::OnGetCookies(uint32 request_context, if (!context) context = Profile::GetDefaultRequestContext(); - // Note: We don't have a policy_url check because plugins bypass the + // Note: We don't have a first_party_for_cookies check because plugins bypass // third-party cookie blocking. *cookies = context->cookie_store()->GetCookies(url); } diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index 785d396..fc57748 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -335,7 +335,7 @@ void ResourceDispatcherHost::BeginRequest( // Construct the request. URLRequest* request = new URLRequest(request_data.url, this); request->set_method(request_data.method); - request->set_policy_url(request_data.policy_url); + request->set_first_party_for_cookies(request_data.first_party_for_cookies); request->set_referrer(request_data.referrer.spec()); request->SetExtraRequestHeaders(request_data.headers); request->set_load_flags(request_data.load_flags); diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc index 6278d3e..3b8a575 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc @@ -36,7 +36,7 @@ static ViewHostMsg_Resource_Request CreateResourceRequest(const char* method, ViewHostMsg_Resource_Request request; request.method = std::string(method); request.url = url; - request.policy_url = url; // bypass third-party cookie blocking + request.first_party_for_cookies = url; // bypass third-party cookie blocking // init the rest to default values to prevent getting UMR. request.frame_origin = "null"; request.main_frame_origin = "null"; diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 9f763f7..bc156c7 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -104,9 +104,11 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter, void OnMsgCreateWindow(int opener_id, bool user_gesture, int* route_id, ModalDialogEvent* modal_dialog_event); void OnMsgCreateWidget(int opener_id, bool activatable, int* route_id); - void OnSetCookie(const GURL& url, const GURL& policy_url, + void OnSetCookie(const GURL& 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 OnGetDataDir(std::wstring* data_dir); void OnPluginMessage(const FilePath& plugin_path, |