Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

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 <string>
 
 #include "base/basictypes.h"
@@ skipping 68 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(SiteDataObserver);
   };
 
   virtual ~TabSpecificContentSettings();
 
   // Returns the object given a render view's id.
   static TabSpecificContentSettings* Get(int render_process_id,
                                          int render_view_id);
 
+  // Returns the object given a render frame's id.
+  static TabSpecificContentSettings* GetForFrame(int render_process_id,
+                                                 int render_view_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(int render_process_id,
                           int render_view_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(int render_process_id,
                             int render_view_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_view_id,
+                                  int render_frame_id,
                                   const GURL& url,
                                   const base::string16& name,
                                   const base::string16& display_name,
                                   bool blocked_by_policy);
 
   // Called when a specific DOM storage area 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 DOMStorageAccessed(int render_process_id,
-                                 int render_view_id,
+                                 int render_frame_id,
                                  const GURL& url,
                                  bool local,
                                  bool blocked_by_policy);
 
   // Called when a specific indexed db factory 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 IndexedDBAccessed(int render_process_id,
-                                int render_view_id,
+                                int render_frame_id,
                                 const GURL& url,
                                 const base::string16& description,
                                 bool blocked_by_policy);
 
   // Called when a specific file system 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 FileSystemAccessed(int render_process_id,
-                                 int render_view_id,
+                                 int render_frame_id,
                                  const GURL& url,
                                  bool blocked_by_policy);
 
   // Resets the |content_blocked_| and |content_allowed_| arrays, except for
   // CONTENT_SETTINGS_TYPE_COOKIES related information.
   void ClearBlockedContentSettingsExceptForCookies();
 
   // Resets all cookies related information.
   void ClearCookieSpecificContentSettings();
 
@@ skipping 105 matching lines @@
   bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
   void set_load_plugins_link_enabled(bool enabled) {
     load_plugins_link_enabled_ = enabled;
   }
 
   // Called to indicate whether access to the Pepper broker was allowed or
   // blocked.
   void SetPepperBrokerAllowed(bool allowed);
 
   // content::WebContentsObserver overrides.
-  virtual void RenderViewForInterstitialPageCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+  virtual void RenderFrameForInterstitialPageCreated(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
       int64 frame_id,
       int64 parent_frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
@@ skipping 119 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_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_