Index: content/shell/common/shell_messages.h |
diff --git a/content/shell/common/shell_messages.h b/content/shell/common/shell_messages.h |
index 66a727d3931137f7bdb72141a276cf7be04672be..6e9eb7c292057b26be2b7ef88d748e71da4114cf 100644 |
--- a/content/shell/common/shell_messages.h |
+++ b/content/shell/common/shell_messages.h |
@@ -6,7 +6,6 @@ |
#include <string> |
#include <vector> |
-#include "components/test_runner/layout_dump_flags.h" |
#include "content/public/common/common_param_traits.h" |
#include "content/public/common/page_state.h" |
#include "content/shell/common/leak_detection_result.h" |
@@ -26,15 +25,7 @@ IPC_STRUCT_TRAITS_MEMBER(enable_pixel_dumping) |
IPC_STRUCT_TRAITS_MEMBER(allow_external_pages) |
IPC_STRUCT_TRAITS_MEMBER(expected_pixel_hash) |
IPC_STRUCT_TRAITS_MEMBER(initial_size) |
-IPC_STRUCT_TRAITS_END() |
- |
-IPC_STRUCT_TRAITS_BEGIN(test_runner::LayoutDumpFlags) |
- IPC_STRUCT_TRAITS_MEMBER(dump_as_text) |
- IPC_STRUCT_TRAITS_MEMBER(dump_child_frames_as_text) |
- IPC_STRUCT_TRAITS_MEMBER(dump_as_markup) |
- IPC_STRUCT_TRAITS_MEMBER(dump_child_frames_as_markup) |
- IPC_STRUCT_TRAITS_MEMBER(dump_child_frame_scroll_positions) |
- IPC_STRUCT_TRAITS_MEMBER(is_printing) |
+IPC_STRUCT_TRAITS_MEMBER(layout_dump_flags_memory_handle) |
IPC_STRUCT_TRAITS_END() |
// Tells the renderer to reset all test runners. |
@@ -69,8 +60,7 @@ IPC_MESSAGE_ROUTED3( |
IPC_MESSAGE_ROUTED0(ShellViewMsg_TryLeakDetection) |
// Asks a frame to dump its contents into a string and send them back over IPC. |
-IPC_MESSAGE_ROUTED1(ShellViewMsg_LayoutDumpRequest, |
- test_runner::LayoutDumpFlags) |
+IPC_MESSAGE_ROUTED0(ShellViewMsg_LayoutDumpRequest) |
// Notifies BlinkTestRunner that the layout dump has completed |
// (and that it can proceed with finishing up the test). |
@@ -82,11 +72,11 @@ IPC_MESSAGE_ROUTED1(ShellViewHostMsg_TextDump, |
std::string /* dump */) |
// Asks the browser process to perform a layout dump (potentially spanning |
-// multiple cross-process frames) using the given flags. This triggers |
-// multiple ShellViewMsg_LayoutDumpRequest / ShellViewHostMsg_LayoutDumpResponse |
-// messages and ends with sending of ShellViewMsg_LayoutDumpCompleted. |
+// multiple cross-process frames). This triggers multiple |
+// ShellViewMsg_LayoutDumpRequest / ShellViewHostMsg_LayoutDumpResponse messages |
+// and ends with sending of ShellViewMsg_LayoutDumpCompleted. |
IPC_MESSAGE_ROUTED1(ShellViewHostMsg_InitiateLayoutDump, |
- test_runner::LayoutDumpFlags) |
+ bool /* dump_child_frames */) |
// Sends a layout dump of a frame (response to ShellViewMsg_LayoutDumpRequest). |
IPC_MESSAGE_ROUTED1(ShellViewHostMsg_LayoutDumpResponse, std::string /* dump */) |