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

content/shell/shell_webpreferences.h

Index: content/shell/shell_webpreferences.h
diff --git a/content/shell/shell_webpreferences.h b/content/shell/shell_webpreferences.h
index 96579d2c4ef4e92707d6134a6a590ef59b63dbfb..17db08be88767db81523abf8099730e0cc071b4c 100644
--- a/content/shell/shell_webpreferences.h
+++ b/content/shell/shell_webpreferences.h
@@ -5,22 +5,16 @@
 #ifndef CONTENT_SHELL_SHELL_WEBPREFERENCES_H_
 #define CONTENT_SHELL_SHELL_WEBPREFERENCES_H_
 
+#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h"
+
 namespace webkit_glue {
 struct WebPreferences;
 }
 
 namespace content {
 
-struct ShellWebPreferences {
-  bool allow_universal_access_from_file_urls;
-  bool dom_paste_enabled;
-  bool javascript_can_access_clipboard;
-  bool xss_auditor_enabled;
-
-  ShellWebPreferences();
-  ~ShellWebPreferences();
-
-  void Apply(webkit_glue::WebPreferences* prefs) const;
+struct ShellWebPreferences : public WebTestRunner::WebPreferences {

[jam, 2012/12/17 16:30:34]

just saw this when looking through your other change. so now this test runner
struct is used for content shell when not running layout tests? do we really
want that?

+  void Export(webkit_glue::WebPreferences* prefs) const;
 };
 
 }  // namespace content