Pass RenderFrameHost to WebContentObservers' message handlers

extensions/browser/extension_function.cc

 // Copyright 2013 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.
 
 #include "extensions/browser/extension_function.h"
 
 #include "base/logging.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 112 matching lines @@
     function_->SetRenderViewHost(NULL);
   }
   virtual void RenderFrameDeleted(
       content::RenderFrameHost* render_frame_host) OVERRIDE {
     if (render_frame_host != function_->render_frame_host())
       return;
 
     function_->SetRenderFrameHost(NULL);
   }
 
+  virtual bool OnMessageReceived(
+      const IPC::Message& message,
+      content::RenderFrameHost* render_frame_host) OVERRIDE {
+    DCHECK(render_frame_host);
+    if (render_frame_host == function_->render_frame_host())
+      return function_->OnMessageReceived(message);
+    else
+      return false;
+  }
+
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     return function_->OnMessageReceived(message);
   }
 
   UIThreadExtensionFunction* function_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderHostTracker);
 };
 
 ExtensionFunction::ExtensionFunction()
@@ skipping 235 matching lines @@
 SyncIOThreadExtensionFunction::SyncIOThreadExtensionFunction() {
 }
 
 SyncIOThreadExtensionFunction::~SyncIOThreadExtensionFunction() {
 }
 
 ExtensionFunction::ResponseAction SyncIOThreadExtensionFunction::Run() {
   return RespondNow(RunSync() ? MultipleArguments(results_.get())
                               : Error(error_));
 }