Alt{Error,404}PageResourceFetcher cleanup.

This change modifies AltErrorPageResourceFetcher to use Callback so that
we can eliminate Alt404PageResourceFetcher.  This change also eliminates
dependencies from AltErrorPageResourceFetcher on WebCore.

BUG=15648
TEST=none
R=tony

Review URL: http://codereview.chromium.org/159262

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

1 files changed, 13 insertions, 1 deletions

diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 4087a2a..ccd08f4 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -151,6 +151,7 @@ MSVC_POP_WARNING();
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebSize.h"
+#include "webkit/api/public/WebURLError.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/dom_operations.h"
@@ -1563,7 +1564,8 @@ void WebFrameImpl::LoadAlternateHTMLErrorPage(const WebURLRequest& request,
                  replace);
 
   alt_error_page_fetcher_.reset(new AltErrorPageResourceFetcher(
-      GetWebViewImpl(), this, error, error_page_url));
+      error_page_url, this, error.unreachableURL,
+      NewCallback(this, &WebFrameImpl::AltErrorPageFinished)));
 }
 
 void WebFrameImpl::DispatchWillSendRequest(WebURLRequest* request) {
@@ -1843,3 +1845,13 @@ void WebFrameImpl::LoadJavaScriptURL(const KURL& url) {
     frame_->loader()->end();
   }
 }
+
+void WebFrameImpl::AltErrorPageFinished(const GURL& unreachable_url,
+                                        const std::string& html) {
+  WebViewDelegate* d = GetWebViewImpl()->delegate();
+  if (!d)
+    return;
+  WebURLError error;
+  error.unreachableURL = unreachable_url;
+  d->LoadNavigationErrorPage(this, WebURLRequest(), error, html, true);
+}