Revert "Create errors (especially cancellation errors) internally to WebCore, rather"

Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp

Index: Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp
diff --git a/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp b/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp
index 5609bbd08e3f6edbdf41f73f7c44118f1c37cd77..67658d49cc9bb725bcc1a80a88c6a548b516387d 100644
--- a/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp
+++ b/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp
@@ -54,6 +54,15 @@ using WebKit::URLTestHelpers::toKURL;
 namespace {
 
 class TestWebFrameClient : public WebFrameClient {
+    // Return a non-null cancellation error so the WebFrame loaders can shut down without asserting.
+    // Make 'reason' non-zero so WebURLError isn't considered null.
+    WebURLError cancelledError(WebFrame*, const WebURLRequest& request)
+    {
+        WebURLError error;
+        error.reason = 1;
+        error.unreachableURL = request.url();
+        return error;
+    }
 };
 
 class AssociatedURLLoaderTest : public testing::Test,