Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/public/browser/render_frame_host.h

Index: content/public/browser/render_frame_host.h
===================================================================
--- content/public/browser/render_frame_host.h	(revision 240362)
+++ content/public/browser/render_frame_host.h	(working copy)
@@ -10,13 +10,21 @@
 #include "ipc/ipc_sender.h"
 
 namespace content {
+class RenderProcessHost;
 
 // The interface provides a communication conduit with a frame in the renderer.
 class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
                                        public IPC::Sender {
  public:
+  // Returns the RenderFrameHost given its ID and the ID of its render process.
+  // Returns NULL if the IDs do not correspond to a live RenderFrameHost.
+  static RenderFrameHost* FromID(int render_process_id, int render_frame_id);
+
   virtual ~RenderFrameHost() {}
 
+  // Returns the process for this frame.
+  virtual RenderProcessHost* GetProcess() = 0;
+
   // Returns the route id for this frame.
   virtual int GetRoutingID() = 0;