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

chrome/browser/content_settings/tab_specific_content_settings.h

Index: chrome/browser/content_settings/tab_specific_content_settings.h
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 239ba0ad5f1dec5787b38bb07232bc53627a34b0..a06044f8c3a6ed0bca676a6be3f2d583e47d1329 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -101,24 +101,24 @@ class TabSpecificContentSettings
   // current page or while loading it. |blocked_by_policy| should be true, if
   // reading cookies was blocked due to the user's content settings. In that
   // case, this function should invoke OnContentBlocked.
-  static void CookiesRead(
-      const base::Callback<content::WebContents*(void)>& wc_getter,
-      const GURL& url,
-      const GURL& first_party_url,
-      const net::CookieList& cookie_list,
-      bool blocked_by_policy);
+  static void CookiesRead(int render_process_id,
+                          int render_frame_id,
+                          const GURL& url,
+                          const GURL& first_party_url,
+                          const net::CookieList& cookie_list,
+                          bool blocked_by_policy);
 
   // Called when a specific cookie in the current page was changed.
   // |blocked_by_policy| should be true, if the cookie was blocked due to the
   // user's content settings. In that case, this function should invoke
   // OnContentBlocked.
-  static void CookieChanged(
-      const base::Callback<content::WebContents*(void)>& wc_getter,
-      const GURL& url,
-      const GURL& first_party_url,
-      const std::string& cookie_line,
-      const net::CookieOptions& options,
-      bool blocked_by_policy);
+  static void CookieChanged(int render_process_id,
+                            int render_frame_id,
+                            const GURL& url,
+                            const GURL& first_party_url,
+                            const std::string& cookie_line,
+                            const net::CookieOptions& options,
+                            bool blocked_by_policy);
 
   // Called when a specific Web database in the current page was accessed. If
   // access was blocked due to the user's content settings,
@@ -397,10 +397,14 @@ class TabSpecificContentSettings
       content::RenderFrameHost* render_frame_host) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
-  void DidStartNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
+  void DidNavigateMainFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) override;
+  void DidStartProvisionalLoadForFrame(
+      content::RenderFrameHost* render_frame_host,
+      const GURL& validated_url,
+      bool is_error_page,
+      bool is_iframe_srcdoc) override;
   void AppCacheAccessed(const GURL& manifest_url,
                         bool blocked_by_policy) override;
 
@@ -420,10 +424,11 @@ class TabSpecificContentSettings
   void ClearMidiContentSettings();
 
   // Updates Geolocation settings on navigation.
-  void GeolocationDidNavigate(content::NavigationHandle* navigation_handle);
+  void GeolocationDidNavigate(
+      const content::LoadCommittedDetails& details);
 
   // Updates MIDI settings on navigation.
-  void MidiDidNavigate(content::NavigationHandle* navigation_handle);
+  void MidiDidNavigate(const content::LoadCommittedDetails& details);
 
   // All currently registered |SiteDataObserver|s.
   base::ObserverList<SiteDataObserver> observer_list_;
@@ -487,9 +492,6 @@ class TabSpecificContentSettings
   bool subresource_filter_enabled_;
   bool subresource_filter_blockage_indicated_;
 
-  // Holds the previous committed url during a navigation.
-  GURL previous_url_;
-
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;