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

Unified Diff: content/shell/webkit_test_runner_host.h

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_bindings.cc ('k') | content/shell/webkit_test_runner_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_runner_host.h
diff --git a/content/shell/webkit_test_runner_host.h b/content/shell/webkit_test_runner_host.h
index ea09ec2f657ccb63759e735d12136df75a9f8ebc..596a910dbd6bbf5d655f0086e3767e90fed75e52 100644
--- a/content/shell/webkit_test_runner_host.h
+++ b/content/shell/webkit_test_runner_host.h
@@ -13,6 +13,7 @@
#include "base/threading/non_thread_safe.h"
#include "content/public/browser/render_view_host_observer.h"
#include "content/public/browser/web_contents_observer.h"
+#include "content/shell/shell_webpreferences.h"
class SkBitmap;
@@ -84,6 +85,7 @@ class WebKitTestController : public base::NonThreadSafe,
void set_printer(WebKitTestResultPrinter* printer) {
printer_.reset(printer);
}
+ const ShellWebPreferences& web_preferences() const { return prefs_; }
// Interface for WebKitTestRunnerHost.
void NotifyDone();
@@ -126,6 +128,7 @@ class WebKitTestController : public base::NonThreadSafe,
void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
void OnTextDump(const std::string& dump);
void OnPrintMessage(const std::string& message);
+ void OnOverridePreferences(const ShellWebPreferences& prefs);
scoped_ptr<WebKitTestResultPrinter> printer_;
@@ -143,6 +146,7 @@ class WebKitTestController : public base::NonThreadSafe,
bool is_printing_;
bool should_stay_on_page_after_handling_before_unload_;
bool wait_until_done_;
+ ShellWebPreferences prefs_;
base::CancelableClosure watchdog_;
« no previous file with comments | « content/shell/webkit_test_runner_bindings.cc ('k') | content/shell/webkit_test_runner_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698