summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/layout_test_controller.h
diff options
context:
space:
mode:
authorantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 14:50:51 +0000
committerantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 14:50:51 +0000
commit5a9d4ed6f85d345926f6e318f51ab6396124468f (patch)
tree2106dab8aa562771605c79d9623bc7df3ca9880f /webkit/tools/test_shell/layout_test_controller.h
parent5cdeb23956072025ff4bc3af2a2ab37896a0822f (diff)
downloadchromium_src-5a9d4ed6f85d345926f6e318f51ab6396124468f.zip
chromium_src-5a9d4ed6f85d345926f6e318f51ab6396124468f.tar.gz
chromium_src-5a9d4ed6f85d345926f6e318f51ab6396124468f.tar.bz2
Switch to renamed method of SecurityPolicy and expose newly added method to layout_test_controller.
http://trac.webkit.org/changeset/57535 renamed SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry. http://trac.webkit.org/changeset/57537 added SecurityOrigin::removeOriginAccessWhitelistEntry Review URL: http://codereview.chromium.org/1742020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.h')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h
index 0dc04df..4c614ab 100644
--- a/webkit/tools/test_shell/layout_test_controller.h
+++ b/webkit/tools/test_shell/layout_test_controller.h
@@ -227,8 +227,11 @@ class LayoutTestController : public CppBoundClass {
// that case (as the Mac does).
void fallbackMethod(const CppArgumentList& args, CppVariant* result);
- // Allows layout tests to call SecurityOrigin::whiteListAccessFromOrigin().
- void whiteListAccessFromOrigin(const CppArgumentList& args, CppVariant* result);
+ // Allows layout tests to manage origins' whitelisting.
+ void addOriginAccessWhitelistEntry(
+ const CppArgumentList& args, CppVariant* result);
+ void removeOriginAccessWhitelistEntry(
+ const CppArgumentList& args, CppVariant* result);
// Clears all databases.
void clearAllDatabases(const CppArgumentList& args, CppVariant* result);