Index: content/shell/browser/layout_test/layout_test_message_filter.cc |
diff --git a/content/shell/browser/layout_test/layout_test_message_filter.cc b/content/shell/browser/layout_test/layout_test_message_filter.cc |
index 165c39db8d91bcd2a9c9c521cb1a81ce3a2b50d6..082fc238870acb9c151c4b01ea6852b70c05ce74 100644 |
--- a/content/shell/browser/layout_test/layout_test_message_filter.cc |
+++ b/content/shell/browser/layout_test/layout_test_message_filter.cc |
@@ -11,6 +11,7 @@ |
#include "content/public/browser/child_process_security_policy.h" |
#include "content/public/browser/permission_type.h" |
#include "content/public/test/layouttest_support.h" |
+#include "content/shell/browser/layout_test/blink_test_controller.h" |
#include "content/shell/browser/layout_test/layout_test_browser_context.h" |
#include "content/shell/browser/layout_test/layout_test_content_browser_client.h" |
#include "content/shell/browser/layout_test/layout_test_notification_manager.h" |
@@ -46,13 +47,18 @@ LayoutTestMessageFilter::~LayoutTestMessageFilter() { |
void LayoutTestMessageFilter::OverrideThreadForMessage( |
const IPC::Message& message, BrowserThread::ID* thread) { |
- if (message.type() == LayoutTestHostMsg_ClearAllDatabases::ID) |
- *thread = BrowserThread::FILE; |
- if (message.type() == LayoutTestHostMsg_SimulateWebNotificationClick::ID || |
- message.type() == LayoutTestHostMsg_SimulateWebNotificationClose::ID || |
- message.type() == LayoutTestHostMsg_SetPermission::ID || |
- message.type() == LayoutTestHostMsg_ResetPermissions::ID) |
- *thread = BrowserThread::UI; |
+ switch (message.type()) { |
+ case LayoutTestHostMsg_ClearAllDatabases::ID: |
+ *thread = BrowserThread::FILE; |
+ break; |
+ case LayoutTestHostMsg_SimulateWebNotificationClick::ID: |
+ case LayoutTestHostMsg_SimulateWebNotificationClose::ID: |
+ case LayoutTestHostMsg_SetPermission::ID: |
+ case LayoutTestHostMsg_ResetPermissions::ID: |
+ case LayoutTestHostMsg_LayoutTestRuntimeFlagsChanged::ID: |
+ *thread = BrowserThread::UI; |
+ break; |
+ } |
} |
bool LayoutTestMessageFilter::OnMessageReceived(const IPC::Message& message) { |
@@ -72,6 +78,8 @@ bool LayoutTestMessageFilter::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(LayoutTestHostMsg_DeleteAllCookies, OnDeleteAllCookies) |
IPC_MESSAGE_HANDLER(LayoutTestHostMsg_SetPermission, OnSetPermission) |
IPC_MESSAGE_HANDLER(LayoutTestHostMsg_ResetPermissions, OnResetPermissions) |
+ IPC_MESSAGE_HANDLER(LayoutTestHostMsg_LayoutTestRuntimeFlagsChanged, |
+ OnLayoutTestRuntimeFlagsChanged) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
@@ -179,4 +187,10 @@ void LayoutTestMessageFilter::OnResetPermissions() { |
->ResetPermissions(); |
} |
+void LayoutTestMessageFilter::OnLayoutTestRuntimeFlagsChanged( |
+ const base::DictionaryValue& changed_layout_test_runtime_flags) { |
+ BlinkTestController::Get()->OnLayoutTestRuntimeFlagsChanged( |
+ render_process_id_, changed_layout_test_runtime_flags); |
+} |
+ |
} // namespace content |