| Index: content/public/test/mock_render_thread.cc
|
| diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
|
| index ae10d820587da2874ddf5416276f5784b4d23cbe..78081c094d4c1d862f3cdf012f841bb0927a2f5a 100644
|
| --- a/content/public/test/mock_render_thread.cc
|
| +++ b/content/public/test/mock_render_thread.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/message_loop/message_loop_proxy.h"
|
| #include "content/common/view_messages.h"
|
| +#include "content/public/renderer/render_process_observer.h"
|
| #include "ipc/ipc_message_utils.h"
|
| #include "ipc/ipc_sync_message.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -54,7 +55,10 @@ bool MockRenderThread::Send(IPC::Message* msg) {
|
| reply_deserializer_.reset(
|
| static_cast<IPC::SyncMessage*>(msg)->GetReplyDeserializer());
|
| }
|
| - OnMessageReceived(*msg);
|
| + if (msg->routing_id() == MSG_ROUTING_CONTROL)
|
| + OnControlMessageReceived(*msg);
|
| + else
|
| + OnMessageReceived(*msg);
|
| }
|
| delete msg;
|
| return true;
|
| @@ -124,9 +128,11 @@ void MockRenderThread::SetOutgoingMessageFilter(
|
| }
|
|
|
| void MockRenderThread::AddObserver(RenderProcessObserver* observer) {
|
| + observers_.AddObserver(observer);
|
| }
|
|
|
| void MockRenderThread::RemoveObserver(RenderProcessObserver* observer) {
|
| + observers_.RemoveObserver(observer);
|
| }
|
|
|
| void MockRenderThread::SetResourceDispatcherDelegate(
|
| @@ -226,6 +232,16 @@ void MockRenderThread::OnCreateWindow(
|
| *cloned_session_storage_namespace_id = 0;
|
| }
|
|
|
| +bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
|
| + ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
|
| + RenderProcessObserver* observer;
|
| + while ((observer = it.GetNext()) != NULL) {
|
| + if (observer->OnControlMessageReceived(msg))
|
| + return true;
|
| + }
|
| + return OnMessageReceived(msg);
|
| +}
|
| +
|
| bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
|
| // Save the message in the sink.
|
| sink_.OnMessageReceived(msg);
|
|
|