| Index: content/shell/renderer/layout_test/blink_test_runner.cc
|
| diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
|
| index 73f4fccba8e3ddc4ba5264b2f00f08d21d8348c9..13f30a302d973daf4c7a7e3b3b05c304fc53bff9 100644
|
| --- a/content/shell/renderer/layout_test/blink_test_runner.cc
|
| +++ b/content/shell/renderer/layout_test/blink_test_runner.cc
|
| @@ -799,8 +799,6 @@ void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
|
| bool BlinkTestRunner::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(BlinkTestRunner, message)
|
| - IPC_MESSAGE_HANDLER(ShellViewMsg_SetTestConfiguration,
|
| - OnSetTestConfiguration)
|
| IPC_MESSAGE_HANDLER(ShellViewMsg_SessionHistory, OnSessionHistory)
|
| IPC_MESSAGE_HANDLER(ShellViewMsg_Reset, OnReset)
|
| IPC_MESSAGE_HANDLER(ShellViewMsg_NotifyDone, OnNotifyDone)
|
| @@ -971,16 +969,11 @@ void BlinkTestRunner::CaptureDumpComplete() {
|
| new ShellViewHostMsg_TestFinished(routing_id())));
|
| }
|
|
|
| -void BlinkTestRunner::OnSetTestConfiguration(
|
| +void BlinkTestRunner::OnReplicateTestConfiguration(
|
| const ShellTestConfiguration& params) {
|
| test_config_ = params;
|
| is_main_window_ = true;
|
|
|
| - ForceResizeRenderView(
|
| - render_view(),
|
| - WebSize(params.initial_size.width(), params.initial_size.height()));
|
| - SetFocus(proxy_, true);
|
| -
|
| test_runner::WebTestInterfaces* interfaces =
|
| LayoutTestRenderProcessObserver::GetInstance()->test_interfaces();
|
| interfaces->SetTestIsRunning(true);
|
| @@ -988,6 +981,16 @@ void BlinkTestRunner::OnSetTestConfiguration(
|
| params.enable_pixel_dumping);
|
| }
|
|
|
| +void BlinkTestRunner::OnSetTestConfiguration(
|
| + const ShellTestConfiguration& params) {
|
| + OnReplicateTestConfiguration(params);
|
| +
|
| + ForceResizeRenderView(
|
| + render_view(),
|
| + WebSize(params.initial_size.width(), params.initial_size.height()));
|
| + SetFocus(proxy_, true);
|
| +}
|
| +
|
| void BlinkTestRunner::OnSessionHistory(
|
| const std::vector<int>& routing_ids,
|
| const std::vector<std::vector<PageState>>& session_histories,
|
|
|