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

content/shell/webkit_test_controller.h

 // 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.
 
 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
 
 #include <ostream>
 #include <string>
 
 #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:
   WebKitTestResultPrinter(std::ostream* output, std::ostream* error);
   ~WebKitTestResultPrinter();
 
   void reset() {
     state_ = BEFORE_TEST;
   }
   bool in_text_block() const { return state_ == IN_TEXT_BLOCK; }
@@ skipping 45 matching lines @@
                             const std::string& expected_pixel_hash);
   // True if the controller was reset successfully.
   bool ResetAfterLayoutTest();
 
   void RendererUnresponsive();
 
   WebKitTestResultPrinter* printer() { return printer_.get(); }
   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_;
   }
 
   // This method can be invoked on any thread.
   bool CanOpenWindows() const;
 
   // WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void PluginCrashed(const FilePath& plugin_path) OVERRIDE;
@@ skipping 38 matching lines @@
   bool enable_pixel_dumping_;
   std::string expected_pixel_hash_;
 
   bool captured_dump_;
 
   bool dump_as_text_;
   bool dump_child_frames_;
   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_;
 
   // Access to the following variables needs to be guarded by |lock_|.
   mutable base::Lock lock_;
   bool can_open_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_