[content shell] use WebTestRunner::WebPreferences for layout tests

Also, implement two further TestDelegate methods

BUG=111316
TEST=xssAuditor tests still work
R=marja@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11565036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173402 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h
index bf974a7..54f77dd 100644
--- a/content/shell/webkit_test_controller.h
+++ b/content/shell/webkit_test_controller.h
@@ -10,17 +10,18 @@
 
 #include "base/cancelable_callback.h"
 #include "base/file_path.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #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;
 
 namespace content {
 
 class Shell;
+struct ShellWebPreferences;
 
 class WebKitTestResultPrinter {
  public:
@@ -86,7 +87,7 @@ class WebKitTestController : public base::NonThreadSafe,
   void set_printer(WebKitTestResultPrinter* printer) {
     printer_.reset(printer);
   }
-  const ShellWebPreferences& web_preferences() const { return prefs_; }
+  const ShellWebPreferences& web_preferences() const { return *prefs_.get(); }
   bool should_stay_on_page_after_handling_before_unload() const {
     return should_stay_on_page_after_handling_before_unload_;
   }
@@ -145,7 +146,9 @@ class WebKitTestController : public base::NonThreadSafe,
   bool is_printing_;
   bool should_stay_on_page_after_handling_before_unload_;
   bool wait_until_done_;
-  ShellWebPreferences prefs_;
+  // TODO(jochen): Once we remove layout tests from content_browsertests, make
+  // this a member instead of a scoped_ptr.
+  scoped_ptr<ShellWebPreferences> prefs_;
 
   base::CancelableClosure watchdog_;