1 files changed, 24 insertions, 6 deletions
diff --git a/WebKit/chromium/src/WebSecurityPolicy.cpp b/WebKit/chromium/src/WebSecurityPolicy.cpp
index 48b445c..58d0893 100644
--- a/WebKit/chromium/src/WebSecurityPolicy.cpp
+++ b/WebKit/chromium/src/WebSecurityPolicy.cpp
@@ -32,6 +32,7 @@
 #include "WebSecurityPolicy.h"
 
 #include "FrameLoader.h"
+#include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
 
 #include "WebString.h"
@@ -43,27 +44,44 @@ namespace WebKit {
 
 void WebSecurityPolicy::registerURLSchemeAsLocal(const WebString& scheme)
 {
-    SecurityOrigin::registerURLSchemeAsLocal(scheme);
+    SchemeRegistry::registerURLSchemeAsLocal(scheme);
 }
 
 void WebSecurityPolicy::registerURLSchemeAsNoAccess(const WebString& scheme)
 {
-    SecurityOrigin::registerURLSchemeAsNoAccess(scheme);
+    SchemeRegistry::registerURLSchemeAsNoAccess(scheme);
 }
 
-void WebSecurityPolicy::whiteListAccessFromOrigin(const WebURL& sourceOrigin,
+void WebSecurityPolicy::registerURLSchemeAsSecure(const WebString& scheme)
+{
+    SchemeRegistry::registerURLSchemeAsSecure(scheme);
+}
+
+void WebSecurityPolicy::addOriginAccessWhitelistEntry(
+    const WebURL& sourceOrigin,
+    const WebString& destinationProtocol,
+    const WebString& destinationHost,
+    bool allowDestinationSubdomains)
+{
+    SecurityOrigin::addOriginAccessWhitelistEntry(
+        *SecurityOrigin::create(sourceOrigin), destinationProtocol,
+        destinationHost, allowDestinationSubdomains);
+}
+
+void WebSecurityPolicy::removeOriginAccessWhitelistEntry(
+    const WebURL& sourceOrigin,
     const WebString& destinationProtocol,
     const WebString& destinationHost,
     bool allowDestinationSubdomains)
 {
-    SecurityOrigin::whiteListAccessFromOrigin(
+    SecurityOrigin::removeOriginAccessWhitelistEntry(
         *SecurityOrigin::create(sourceOrigin), destinationProtocol,
         destinationHost, allowDestinationSubdomains);
 }
 
-void WebSecurityPolicy::resetOriginAccessWhiteLists()
+void WebSecurityPolicy::resetOriginAccessWhitelists()
 {
-    SecurityOrigin::resetOriginAccessWhiteLists();
+    SecurityOrigin::resetOriginAccessWhitelists();
 }
 
 bool WebSecurityPolicy::shouldHideReferrer(const WebURL& url, const WebString& referrer)