Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: content/shell/webkit_test_runner_host.cc

Issue 11316244: [content shell] add support for a testRunner.setXSSAuditorEnabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/webkit_test_runner_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_runner_host.cc
diff --git a/content/shell/webkit_test_runner_host.cc b/content/shell/webkit_test_runner_host.cc
index f8e45e57d0b8fb2084b659f437d89fff42ca9b3a..5eef32d785f7a63b2f0b5978633f4abde0a93ae7 100644
--- a/content/shell/webkit_test_runner_host.cc
+++ b/content/shell/webkit_test_runner_host.cc
@@ -180,6 +180,7 @@ bool WebKitTestController::ResetAfterLayoutTest() {
is_printing_ = false;
should_stay_on_page_after_handling_before_unload_ = false;
wait_until_done_ = false;
+ prefs_ = ShellWebPreferences();
watchdog_.Cancel();
if (main_window_) {
Observe(NULL);
@@ -231,6 +232,8 @@ bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ShellViewHostMsg_PrintMessage, OnPrintMessage)
IPC_MESSAGE_HANDLER(ShellViewHostMsg_TextDump, OnTextDump)
IPC_MESSAGE_HANDLER(ShellViewHostMsg_ImageDump, OnImageDump)
+ IPC_MESSAGE_HANDLER(ShellViewHostMsg_OverridePreferences,
+ OnOverridePreferences)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -348,6 +351,11 @@ void WebKitTestController::OnPrintMessage(const std::string& message) {
printer_->AddMessageRaw(message);
}
+void WebKitTestController::OnOverridePreferences(
+ const ShellWebPreferences& prefs) {
+ prefs_ = prefs;
+}
+
// WebKitTestRunnerHost -------------------------------------------------------
WebKitTestRunnerHost::WebKitTestRunnerHost(
« no previous file with comments | « content/shell/webkit_test_runner_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698