webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 4 insertions, 9 deletions

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp
index 091e5a942..783aebe7a 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp
@@ -24,14 +24,11 @@
  */
 
 #include "config.h"
-
-#if WK_HAVE_C_SPI
-
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit/WKBundlePage.h>
-#include <WebKit/WKRetainPtr.h>
+#include <WebKit2/WKBundlePage.h>
+#include <WebKit2/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
@@ -50,7 +47,7 @@ private:
         WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
         WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
 
-        WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
+        WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
     }
 
     static void willLoadDataRequest(WKBundlePageRef page, WKURLRequestRef request, WKDataRef data, WKStringRef MIMEType, WKStringRef encodingName, WKURLRef unreachableURL, WKTypeRef userData, const void *clientInfo)
@@ -64,7 +61,7 @@ private:
         WKDictionarySetItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
         WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
 
-        WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());
+        WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());
 
     }
 
@@ -85,5 +82,3 @@ private:
 static InjectedBundleTest::Register<WillLoadTest> registrar("WillLoadTest");
 
 } // namespace TestWebKitAPI
-
-#endif