Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
===================================================================
--- content/browser/frame_host/render_frame_host_impl.cc	(revision 240362)
+++ content/browser/frame_host/render_frame_host_impl.cc	(working copy)
@@ -26,9 +26,15 @@
 static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map =
     LAZY_INSTANCE_INITIALIZER;
 
+RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
+                                         int render_frame_id) {
+  return RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+}
+
 // static
 RenderFrameHostImpl* RenderFrameHostImpl::FromID(
     int process_id, int routing_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
   RoutingIDFrameMap::iterator it = frames->find(
       RenderFrameHostID(process_id, routing_id));
@@ -62,6 +68,12 @@
     delegate_->RenderFrameDeleted(this);
 }
 
+RenderProcessHost* RenderFrameHostImpl::GetProcess() {
+  // TODO(nasko): This should return its own process, once we have working
+  // cross-process navigation for subframes.
+  return render_view_host_->GetProcess();
+}
+
 int RenderFrameHostImpl::GetRoutingID() {
   return routing_id_;
 }
@@ -96,12 +108,6 @@
   GetProcess()->ResumeRequestsForView(routing_id());
 }
 
-RenderProcessHost* RenderFrameHostImpl::GetProcess() const {
-  // TODO(nasko): This should return its own process, once we have working
-  // cross-process navigation for subframes.
-  return render_view_host_->GetProcess();
-}
-
 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
                                              int64 parent_frame_id,
                                              int64 frame_id,