Revert "Don't update TabSpecificContentSettings on same-page navigation"

chrome/browser/net/chrome_network_delegate.cc

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 9d4519bb665254c556978502af2bbb3b63e44e18..b7145114b785513abbd915a0684e8b71b6329c73 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -433,12 +433,14 @@ bool ChromeNetworkDelegate::OnCanGetCookies(
   bool allow = cookie_settings_->IsReadingCookieAllowed(
       request.url(), request.first_party_for_cookies());
 
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
-  if (info) {
+  int render_process_id = -1;
+  int render_frame_id = -1;
+  if (content::ResourceRequestInfo::GetRenderFrameForRequest(
+          &request, &render_process_id, &render_frame_id)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookiesRead,
-                   info->GetWebContentsGetterForRequest(),
+                   render_process_id, render_frame_id,
                    request.url(), request.first_party_for_cookies(),
                    cookie_list, !allow));
   }
@@ -456,12 +458,14 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
   bool allow = cookie_settings_->IsSettingCookieAllowed(
       request.url(), request.first_party_for_cookies());
 
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
-  if (info) {
+  int render_process_id = -1;
+  int render_frame_id = -1;
+  if (content::ResourceRequestInfo::GetRenderFrameForRequest(
+          &request, &render_process_id, &render_frame_id)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookieChanged,
-                   info->GetWebContentsGetterForRequest(),
+                   render_process_id, render_frame_id,
                    request.url(), request.first_party_for_cookies(),
                    cookie_line, *options, !allow));
   }