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

content/shell/webkit_test_controller.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_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_messages.h"
 #include "content/shell/shell_switches.h"
+#include "content/shell/shell_webpreferences.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/support/webkit_support_gfx.h"
 
 namespace content {
 
 namespace {
 const int kTestTimeoutMilliseconds = 30 * 1000;
 }  // namespace
 
 // WebKitTestResultPrinter ----------------------------------------------------
@@ skipping 148 matching lines @@
   printer_->PrintTextFooter();
   printer_->PrintImageFooter();
   enable_pixel_dumping_ = false;
   expected_pixel_hash_.clear();
   captured_dump_ = false;
   dump_as_text_ = false;
   dump_child_frames_ = false;
   is_printing_ = false;
   should_stay_on_page_after_handling_before_unload_ = false;
   wait_until_done_ = false;
-  prefs_ = ShellWebPreferences();
+  prefs_.reset(new ShellWebPreferences);
   {
     base::AutoLock lock(lock_);
     can_open_windows_ = false;
   }
   watchdog_.Cancel();
   if (main_window_) {
     Observe(NULL);
     main_window_ = NULL;
   }
   Shell::CloseAllWindows();
@@ skipping 154 matching lines @@
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 }
 
 void WebKitTestController::OnPrintMessage(const std::string& message) {
   printer_->AddMessageRaw(message);
 }
 
 void WebKitTestController::OnOverridePreferences(
     const ShellWebPreferences& prefs) {
-  prefs_ = prefs;
+  *prefs_.get() = prefs;
 }
 
 void WebKitTestController::OnNotifyDone() {
   if (!wait_until_done_)
     return;
   watchdog_.Cancel();
   CaptureDump();
 }
 
 void WebKitTestController::OnDumpAsText() {
@@ skipping 52 matching lines @@
 
 void WebKitTestController::OnNotImplemented(
     const std::string& object_name,
     const std::string& property_name) {
   printer_->AddErrorMessage(
       std::string("FAIL: NOT IMPLEMENTED: ") +
       object_name + "." + property_name);
 }
 
 }  // namespace content