diff options
Diffstat (limited to 'content/shell/shell_messages.h')
| -rw-r--r-- | content/shell/shell_messages.h | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/content/shell/shell_messages.h b/content/shell/shell_messages.h index 1f86dac..d725d70 100644 --- a/content/shell/shell_messages.h +++ b/content/shell/shell_messages.h @@ -7,37 +7,22 @@ #include <vector> #include "content/public/common/common_param_traits.h" +#include "content/shell/shell_test_configuration.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" #include "third_party/skia/include/core/SkBitmap.h" #define IPC_MESSAGE_START ShellMsgStart -IPC_STRUCT_BEGIN(ShellViewMsg_SetTestConfiguration_Params) - // The current working directory. - IPC_STRUCT_MEMBER(base::FilePath, current_working_directory) - - // The temporary directory of the system. - IPC_STRUCT_MEMBER(base::FilePath, temp_path) - - // The URL of the current layout test. - IPC_STRUCT_MEMBER(GURL, test_url) - - // True if pixel tests are enabled. - IPC_STRUCT_MEMBER(bool, enable_pixel_dumping) - - // The layout test timeout in milliseconds. - IPC_STRUCT_MEMBER(int, layout_test_timeout) - - // True if tests can open external URLs - IPC_STRUCT_MEMBER(bool, allow_external_pages) - - // The expected MD5 hash of the pixel results. - IPC_STRUCT_MEMBER(std::string, expected_pixel_hash) -IPC_STRUCT_END() - -// Tells the renderer to reset all test runners. -IPC_MESSAGE_CONTROL0(ShellViewMsg_ResetAll) +IPC_STRUCT_TRAITS_BEGIN(content::ShellTestConfiguration) +IPC_STRUCT_TRAITS_MEMBER(current_working_directory) +IPC_STRUCT_TRAITS_MEMBER(temp_path) +IPC_STRUCT_TRAITS_MEMBER(test_url) +IPC_STRUCT_TRAITS_MEMBER(enable_pixel_dumping) +IPC_STRUCT_TRAITS_MEMBER(layout_test_timeout) +IPC_STRUCT_TRAITS_MEMBER(allow_external_pages) +IPC_STRUCT_TRAITS_MEMBER(expected_pixel_hash) +IPC_STRUCT_TRAITS_END() // Sets the path to the WebKit checkout. IPC_MESSAGE_CONTROL1(ShellViewMsg_SetWebKitSourceDir, @@ -49,7 +34,7 @@ IPC_MESSAGE_CONTROL1(ShellViewMsg_LoadHyphenDictionary, // Sets the initial configuration to use for layout tests. IPC_MESSAGE_ROUTED1(ShellViewMsg_SetTestConfiguration, - ShellViewMsg_SetTestConfiguration_Params) + content::ShellTestConfiguration) // Pushes a snapshot of the current session history from the browser process. // This includes only information about those RenderViews that are in the |