diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 14:09:27 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 14:09:27 +0000 |
| commit | 9e5be41af9f9946ae195920c13a6cdebddc989c2 (patch) | |
| tree | 1b39d0900c7b463e43bf2ef5f381bf2610bc5da2 /webkit/tools/test_shell/layout_test_controller.cc | |
| parent | 762a91816bcce1e9d406251ec0db132e645bacad (diff) | |
| download | chromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.zip chromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.tar.gz chromium_src-9e5be41af9f9946ae195920c13a6cdebddc989c2.tar.bz2 | |
TBR: darin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index db50fac..48ec6f0 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -18,7 +18,6 @@ #include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebKit.h" #include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebSecurityPolicy.h" #include "webkit/api/public/WebURL.h" #include "webkit/api/public/WebView.h" #include "webkit/glue/dom_operations.h" @@ -33,7 +32,6 @@ using std::wstring; using WebKit::WebConsoleMessage; using WebKit::WebScriptSource; -using WebKit::WebSecurityPolicy; using WebKit::WebString; TestShell* LayoutTestController::shell_ = NULL; @@ -441,7 +439,7 @@ void LayoutTestController::Reset() { webHistoryItemCount_.Set(0); SimpleResourceLoaderBridge::SetAcceptAllCookies(false); - WebSecurityPolicy::resetOriginAccessWhiteLists(); + WebKit::resetOriginAccessWhiteLists(); setlocale(LC_ALL, ""); @@ -971,10 +969,10 @@ void LayoutTestController::whiteListAccessFromOrigin( if (!url.isValid()) return; - WebSecurityPolicy::whiteListAccessFromOrigin(url, - WebString::fromUTF8(args[1].ToString()), - WebString::fromUTF8(args[2].ToString()), - args[3].ToBoolean()); + WebKit::whiteListAccessFromOrigin(url, + WebString::fromUTF8(args[1].ToString()), + WebString::fromUTF8(args[2].ToString()), + args[3].ToBoolean()); } void LayoutTestController::clearAllDatabases( |