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

content/shell/webkit_test_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/webkit_test_runner.h"
 
 #include <cmath>
 
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 29 matching lines @@
 using WebKit::WebContextMenuData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGamepads;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebVector;
 using WebKit::WebView;
+using WebTestRunner::WebPreferences;
 using WebTestRunner::WebTask;
 
 namespace content {
 
 namespace {
 
 void InvokeTaskHelper(void* context) {
   WebTask* task = reinterpret_cast<WebTask*>(context);
   task->run();
   delete task;
@@ skipping 168 matching lines @@
 #endif
   if (!path.IsAbsolute()) {
     GURL base_url =
         net::FilePathToFileURL(current_working_directory_.Append(
             FILE_PATH_LITERAL("foo")));
     net::FileURLToFilePath(base_url.Resolve(utf8_path), &path);
   }
   return webkit_base::FilePathToWebString(path);
 }
 
+WebPreferences* WebKitTestRunner::preferences() {
+  return &prefs_;
+}
+
+void WebKitTestRunner::applyPreferences() {
+  webkit_glue::WebPreferences prefs = render_view()->GetWebkitPreferences();
+  prefs_.Export(&prefs);
+  render_view()->SetWebkitPreferences(prefs);
+  Send(new ShellViewHostMsg_OverridePreferences(routing_id(), prefs_));
+}
+
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
   ShellRenderProcessObserver::GetInstance()->BindTestRunnersToWindow(frame);
 }
 
 void WebKitTestRunner::DidFinishLoad(WebFrame* frame) {
   if (!frame->parent())
     Send(new ShellViewHostMsg_DidFinishLoad(routing_id()));
 }
@@ skipping 21 matching lines @@
 
 void WebKitTestRunner::Display() {
   const WebSize& size = render_view()->GetWebView()->size();
   WebRect rect(0, 0, size.width, size.height);
   proxy_->setPaintRect(rect);
   PaintInvalidatedRegion();
   DisplayRepaintMask();
 }
 
 void WebKitTestRunner::SetXSSAuditorEnabled(bool enabled) {
-  prefs_.xss_auditor_enabled = enabled;
+  prefs_.XSSAuditorEnabled = enabled;
   webkit_glue::WebPreferences prefs = render_view()->GetWebkitPreferences();
-  prefs_.Apply(&prefs);
+  prefs_.Export(&prefs);
   render_view()->SetWebkitPreferences(prefs);
   Send(new ShellViewHostMsg_OverridePreferences(routing_id(), prefs_));
 }
 
 void WebKitTestRunner::NotifyDone() {
   Send(new ShellViewHostMsg_NotifyDone(routing_id()));
 }
 
 void WebKitTestRunner::DumpAsText() {
   Send(new ShellViewHostMsg_DumpAsText(routing_id()));
@@ skipping 35 matching lines @@
   if (agent)
     agent->evaluateInWebInspector(call_id, WebString::fromUTF8(script));
 }
 
 void WebKitTestRunner::NotImplemented(const std::string& object,
                                       const std::string& method) {
   Send(new ShellViewHostMsg_NotImplemented(routing_id(), object, method));
 }
 
 void WebKitTestRunner::Reset() {
-  prefs_ = ShellWebPreferences();
+  prefs_.reset();
   webkit_glue::WebPreferences prefs = render_view()->GetWebkitPreferences();
-  prefs_.Apply(&prefs);
+  prefs_.Export(&prefs);
   render_view()->SetWebkitPreferences(prefs);
 }
 
 // Private methods  -----------------------------------------------------------
 
 void WebKitTestRunner::OnCaptureTextDump(bool as_text,
                                          bool printing,
                                          bool recursive) {
   WebFrame* frame = render_view()->GetWebView()->mainFrame();
   std::string dump;
@@ skipping 110 matching lines @@
     PaintRect(rect);
   }
   CHECK(proxy_->paintRect().isEmpty());
 }
 
 void WebKitTestRunner::DisplayRepaintMask() {
   GetCanvas()->drawARGB(167, 0, 0, 0);
 }
 
 }  // namespace content