diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 11:55:25 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 11:55:25 +0000 |
commit | 55915a7a9e8f6a81434cd0f3e751f972d5858768 (patch) | |
tree | 9a202b61f7c9e43abf6627c9e7f7e3766c572740 /content/shell/webkit_test_helpers.cc | |
parent | c7e946703878b721faf0a9e80e13f6c81224d505 (diff) | |
download | chromium_src-55915a7a9e8f6a81434cd0f3e751f972d5858768.zip chromium_src-55915a7a9e8f6a81434cd0f3e751f972d5858768.tar.gz chromium_src-55915a7a9e8f6a81434cd0f3e751f972d5858768.tar.bz2 |
[content shell] delete ShellWebPreferences.
Instead, pass around webkit_glue::WebPreferences instances
BUG=111316
R=jam@chromium.org,tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11614003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_helpers.cc')
-rw-r--r-- | content/shell/webkit_test_helpers.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/content/shell/webkit_test_helpers.cc b/content/shell/webkit_test_helpers.cc new file mode 100644 index 0000000..9911ab2 --- /dev/null +++ b/content/shell/webkit_test_helpers.cc @@ -0,0 +1,26 @@ +// 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_helpers.h" + +#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h" +#include "webkit/glue/webpreferences.h" + +using WebTestRunner::WebPreferences; + +namespace content { + +void ExportPreferences(const WebPreferences& from, + webkit_glue::WebPreferences* to) { + to->allow_universal_access_from_file_urls = + from.allowUniversalAccessFromFileURLs; + to->dom_paste_enabled = from.DOMPasteAllowed; + to->javascript_can_access_clipboard = from.javaScriptCanAccessClipboard; + to->xss_auditor_enabled = from.XSSAuditorEnabled; + to->editing_behavior = + static_cast<webkit_glue::WebPreferences::EditingBehavior>( + from.editingBehavior); +} + +} // namespace content |