| Index: chrome/browser/renderer_host/mock_render_process_host.cc
|
| ===================================================================
|
| --- chrome/browser/renderer_host/mock_render_process_host.cc (revision 21759)
|
| +++ chrome/browser/renderer_host/mock_render_process_host.cc (working copy)
|
| @@ -30,8 +30,7 @@
|
| }
|
|
|
| void MockRenderProcessHost::CrossSiteClosePageACK(
|
| - int new_render_process_host_id,
|
| - int new_request_id) {
|
| + const ViewMsg_ClosePage_Params& params) {
|
| }
|
|
|
| bool MockRenderProcessHost::WaitForPaintMsg(int render_widget_id,
|
|
|
| Property changes on: chrome\browser\renderer_host\mock_render_process_host.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /trunk/src/chrome/browser/renderer_host/mock_render_process_host.cc:r21531
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/renderer_host/mock_render_process_host.cc:r69-2775
|
|
|
|
|