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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f3e709a1f2d2b92bd07a0e3402e4d1ca764d07f7..5fe72ae6e8dd6334e9d08444b247c21f7fab5f77 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -801,12 +801,6 @@ class ClearSiteDataObserver : public BrowsingDataRemover::Observer {
   int count_;
 };
 
-WebContents* GetWebContents(int render_process_id, int render_frame_id) {
-  RenderFrameHost* rfh =
-      RenderFrameHost::FromID(render_process_id, render_frame_id);
-  return WebContents::FromRenderFrameHost(rfh);
-}
-
 }  // namespace
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
@@ -1861,12 +1855,10 @@ bool ChromeContentBrowserClient::AllowGetCookie(
   bool allow = io_data->GetCookieSettings()->
       IsReadingCookieAllowed(url, first_party);
 
-  base::Callback<content::WebContents*(void)> wc_getter =
-      base::Bind(&GetWebContents, render_process_id, render_frame_id);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&TabSpecificContentSettings::CookiesRead, wc_getter, url,
-                 first_party, cookie_list, !allow));
+      base::Bind(&TabSpecificContentSettings::CookiesRead, render_process_id,
+                 render_frame_id, url, first_party, cookie_list, !allow));
   return allow;
 }
 
@@ -1884,12 +1876,11 @@ bool ChromeContentBrowserClient::AllowSetCookie(
       io_data->GetCookieSettings();
   bool allow = cookie_settings->IsSettingCookieAllowed(url, first_party);
 
-  base::Callback<content::WebContents*(void)> wc_getter =
-      base::Bind(&GetWebContents, render_process_id, render_frame_id);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&TabSpecificContentSettings::CookieChanged, wc_getter, url,
-                 first_party, cookie_line, options, !allow));
+      base::Bind(&TabSpecificContentSettings::CookieChanged, render_process_id,
+                 render_frame_id, url, first_party, cookie_line, options,
+                 !allow));
   return allow;
 }