| Index: chrome/browser/net/chrome_network_delegate.cc
|
| diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
|
| index 64af726ee1c15390bf59ef79f0975119ad624de6..f981c266a3e50c10151431648c0635fe407846d8 100644
|
| --- a/chrome/browser/net/chrome_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_network_delegate.cc
|
| @@ -425,14 +425,12 @@ bool ChromeNetworkDelegate::OnCanGetCookies(
|
| bool allow = cookie_settings_->IsReadingCookieAllowed(
|
| request.url(), request.first_party_for_cookies());
|
|
|
| - int render_process_id = -1;
|
| - int render_frame_id = -1;
|
| - if (content::ResourceRequestInfo::GetRenderFrameForRequest(
|
| - &request, &render_process_id, &render_frame_id)) {
|
| + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
|
| + if (info) {
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| base::Bind(&TabSpecificContentSettings::CookiesRead,
|
| - render_process_id, render_frame_id,
|
| + info->GetWebContentsGetterForRequest(),
|
| request.url(), request.first_party_for_cookies(),
|
| cookie_list, !allow));
|
| }
|
| @@ -450,14 +448,12 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
|
| bool allow = cookie_settings_->IsSettingCookieAllowed(
|
| request.url(), request.first_party_for_cookies());
|
|
|
| - int render_process_id = -1;
|
| - int render_frame_id = -1;
|
| - if (content::ResourceRequestInfo::GetRenderFrameForRequest(
|
| - &request, &render_process_id, &render_frame_id)) {
|
| + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
|
| + if (info) {
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| base::Bind(&TabSpecificContentSettings::CookieChanged,
|
| - render_process_id, render_frame_id,
|
| + info->GetWebContentsGetterForRequest(),
|
| request.url(), request.first_party_for_cookies(),
|
| cookie_line, *options, !allow));
|
| }
|
|
|