Reverting 23931.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23939 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 50 deletions

diff --git a/webkit/api/public/WebKit.h b/webkit/api/public/WebKit.h
index e0fc2b7..4b5c1a6 100644
--- a/webkit/api/public/WebKit.h
+++ b/webkit/api/public/WebKit.h
@@ -32,7 +32,6 @@
 #define WebKit_h
 
 #include "WebCommon.h"
-#include "WebURL.h"
 
 namespace v8 {
     class Extension;
@@ -101,13 +100,6 @@ namespace WebKit {
     // Enables HTML5 database support.
     WEBKIT_API void enableDatabases();
     WEBKIT_API bool databasesEnabled();
-
-    // Support for whitelisting access to origins beyond the same-origin policy.
-    WEBKIT_API void whiteListAccessFromOrigin(
-        const WebURL& sourceOrigin, const WebString& destinationProtocol,
-        const WebString& destinationHost, bool allowDestinationSubdomains);
-    WEBKIT_API void resetOriginAccessWhiteLists();
-
 } // namespace WebKit
 
 #endif
diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp
index 55b9088..93ddc72 100644
--- a/webkit/api/src/WebKit.cpp
+++ b/webkit/api/src/WebKit.cpp
@@ -157,19 +157,4 @@ void enableV8SingleThreadMode()
     WebCore::enableStringImplCache();
 }
 
-void whiteListAccessFromOrigin(const WebURL& sourceOrigin,
-                               const WebString& destinationProtocol,
-                               const WebString& destinationHost,
-                               bool allowDestinationSubdomains)
-{
-    WebCore::SecurityOrigin::whiteListAccessFromOrigin(
-        *WebCore::SecurityOrigin::create(sourceOrigin), destinationProtocol,
-        destinationHost, allowDestinationSubdomains);
-}
-
-void resetOriginAccessWhiteLists()
-{
-    WebCore::SecurityOrigin::resetOriginAccessWhiteLists();
-}
-
 } // namespace WebKit
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 47b1ab3..908a0ec 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2906,3 +2906,12 @@ BUG19842 MAC : LayoutTests/fast/forms/input-type-change2.html = CRASH
 // New test. WebKit change http://trac.webkit.org/changeset/47431
 // Does not work in Chromium yet (not supporting wav format)
 BUG19904 WIN : LayoutTests/media/progress-event-at-least-one.html = FAIL TIMEOUT
+
+// WebKit merge 47546:47575 new tests, WebKit change http://trac.webkit.org/changeset/47548
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-all.html = TIMEOUT
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-exact-match.html = TIMEOUT
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https.html = TIMEOUT
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html = TIMEOUT
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses.html = TIMEOUT
+BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-subdomains.html = TIMEOUT
+
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index d226575..fe09e99 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -15,9 +15,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "webkit/api/public/WebFrame.h"
-#include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
-#include "webkit/api/public/WebURL.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
@@ -120,7 +118,6 @@ LayoutTestController::LayoutTestController(TestShell* shell) {
   BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate);
   BindMethod("waitForPolicyDelegate", &LayoutTestController::waitForPolicyDelegate);
   BindMethod("setWillSendRequestReturnsNullOnRedirect", &LayoutTestController::setWillSendRequestReturnsNullOnRedirect);
-  BindMethod("whiteListAccessFromOrigin", &LayoutTestController::whiteListAccessFromOrigin);
 
   // The following are stubs.
   BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive);
@@ -428,8 +425,6 @@ void LayoutTestController::Reset() {
   globalFlag_.Set(false);
   webHistoryItemCount_.Set(0);
 
-  WebKit::resetOriginAccessWhiteLists();
-
   if (close_remaining_windows_) {
     // Iterate through the window list and close everything except the original
     // shell.  We don't want to delete elements as we're iterating, so we copy
@@ -929,22 +924,3 @@ void LayoutTestController::fallbackMethod(
   }
   result->SetNull();
 }
-
-void LayoutTestController::whiteListAccessFromOrigin(
-    const CppArgumentList& args, CppVariant* result)
-{
-  result->SetNull();
-
-  if (args.size() != 4 || !args[0].isString() || !args[1].isString() ||
-      !args[2].isString() || !args[3].isBool())
-    return;
-
-  WebKit::WebURL url(GURL(args[0].ToString()));
-  if (!url.isValid())
-    return;
-
-  WebKit::whiteListAccessFromOrigin(url,
-                                    WebString::fromUTF8(args[1].ToString()),
-                                    WebString::fromUTF8(args[2].ToString()),
-                                    args[3].ToBoolean());
-}
diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h
index 47cda91..c16f185 100644
--- a/webkit/tools/test_shell/layout_test_controller.h
+++ b/webkit/tools/test_shell/layout_test_controller.h
@@ -191,9 +191,6 @@ 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);
-
  public:
   // The following methods are not exposed to JavaScript.
   void SetWorkQueueFrozen(bool frozen) { work_queue_.set_frozen(frozen); }