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_; |