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

chrome/browser/content_settings/tab_specific_content_settings.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 83 matching lines @@
 
   // Returns the object given a RenderFrameHost ids.
   static TabSpecificContentSettings* GetForFrame(int render_process_id,
                                                  int render_frame_id);
 
   // Static methods called on the UI threads.
   // Called when cookies for the given URL were read either from within the
   // 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,
   // |blocked_by_policy| should be true, and this function should invoke
   // OnContentBlocked.
   static void WebDatabaseAccessed(int render_process_id,
                                   int render_frame_id,
                                   const GURL& url,
                                   const base::string16& name,
                                   const base::string16& display_name,
@@ skipping 258 matching lines @@
  private:
   friend class content::WebContentsUserData<TabSpecificContentSettings>;
 
   explicit TabSpecificContentSettings(content::WebContents* tab);
 
   // content::WebContentsObserver overrides.
   void RenderFrameForInterstitialPageCreated(
       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;
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
   // Notifies all registered |SiteDataObserver|s.
   void NotifySiteDataObservers();
 
   // Clears the Geolocation settings.
   void ClearGeolocationContentSettings();
 
   // Clears the MIDI settings.
   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_;
 
   struct ContentSettingsStatus {
     bool blocked;
     bool blockage_indicated_to_user;
     bool allowed;
   };
   // Stores which content setting types actually have blocked content.
@@ skipping 43 matching lines @@
 
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Manages information about Subresource filtering activation.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_