| 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 4862675017fa054f39f690e1d5db27d784a9a692..848a710c8b2ad48e268a3f92b2fbd61d5294f01f 100644
|
| --- a/content/public/test/mock_render_thread.cc
|
| +++ b/content/public/test/mock_render_thread.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/public/test/mock_render_thread.h"
|
|
|
| #include "base/message_loop/message_loop_proxy.h"
|
| +#include "content/common/frame_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/public/renderer/render_process_observer.h"
|
| #include "ipc/ipc_message_utils.h"
|
| @@ -19,7 +20,8 @@ MockRenderThread::MockRenderThread()
|
| surface_id_(0),
|
| opener_id_(0),
|
| new_window_routing_id_(0),
|
| - new_window_main_frame_routing_id_(0) {
|
| + new_window_main_frame_routing_id_(0),
|
| + new_frame_routing_id_(0) {
|
| }
|
|
|
| MockRenderThread::~MockRenderThread() {
|
| @@ -228,6 +230,15 @@ void MockRenderThread::OnCreateWindow(
|
| *cloned_session_storage_namespace_id = 0;
|
| }
|
|
|
| +// The Frame expects to be returned a valid route_id different from its own.
|
| +void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id,
|
| + int64 parent_frame_id,
|
| + int64 frame_id,
|
| + const std::string& frame_name,
|
| + int* new_render_frame_id) {
|
| + *new_render_frame_id = new_frame_routing_id_;
|
| +}
|
| +
|
| bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
|
| ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
|
| RenderProcessObserver* observer;
|
| @@ -247,6 +258,7 @@ bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
|
| IPC_BEGIN_MESSAGE_MAP_EX(MockRenderThread, msg, msg_is_ok)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow)
|
| + IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP_EX()
|
| return handled;
|
|
|