Introduce WebSecurityPolicy for security related methods

webkit/tools/test_shell/layout_test_controller.cc

Index: webkit/tools/test_shell/layout_test_controller.cc
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 48ec6f0675a79cbd5ea796ed70c0016b8dc0b442..db50fac7ca86c03fbc3bbbc70d2eadef2623ff55 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -18,6 +18,7 @@
 #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"
@@ -32,6 +33,7 @@ using std::wstring;
 
 using WebKit::WebConsoleMessage;
 using WebKit::WebScriptSource;
+using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 
 TestShell* LayoutTestController::shell_ = NULL;
@@ -439,7 +441,7 @@ void LayoutTestController::Reset() {
   webHistoryItemCount_.Set(0);
 
   SimpleResourceLoaderBridge::SetAcceptAllCookies(false);
-  WebKit::resetOriginAccessWhiteLists();
+  WebSecurityPolicy::resetOriginAccessWhiteLists();
 
   setlocale(LC_ALL, "");
 
@@ -969,10 +971,10 @@ void LayoutTestController::whiteListAccessFromOrigin(
   if (!url.isValid())
     return;
 
-  WebKit::whiteListAccessFromOrigin(url,
-                                    WebString::fromUTF8(args[1].ToString()),
-                                    WebString::fromUTF8(args[2].ToString()),
-                                    args[3].ToBoolean());
+  WebSecurityPolicy::whiteListAccessFromOrigin(url,
+      WebString::fromUTF8(args[1].ToString()),
+      WebString::fromUTF8(args[2].ToString()),
+       args[3].ToBoolean());
 }
 
 void LayoutTestController::clearAllDatabases(