Move alternate 404 error page loading out of WebFrame and into RenderView....

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 199 matching lines @@
     }
     if (policy_delegate_should_notify_done_)
       shell_->layout_test_controller()->PolicyDelegateDone();
   } else {
     result = default_policy;
   }
   return result;
 }
 
 void TestWebViewDelegate::AssignIdentifierToRequest(
-    WebView* webview,
+    WebFrame* webframe,
     uint32 identifier,
     const WebURLRequest& request) {
   if (shell_->ShouldDumpResourceLoadCallbacks())
     resource_identifier_map_[identifier] = request.url().spec();
 }
 
 std::string TestWebViewDelegate::GetResourceDescription(uint32 identifier) {
   ResourceMap::iterator it = resource_identifier_map_.find(identifier);
   return it != resource_identifier_map_.end() ? it->second : "<unknown>";
 }
 
-void TestWebViewDelegate::WillSendRequest(WebView* webview,
+void TestWebViewDelegate::WillSendRequest(WebFrame* webframe,
                                           uint32 identifier,
                                           WebURLRequest* request) {
   GURL url = request->url();
   std::string request_url = url.possibly_invalid_spec();
   std::string host = url.host();
 
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     printf("%s - willSendRequest <WebRequest URL \"%s\">\n",
            GetResourceDescription(identifier).c_str(),
            request_url.c_str());
@@ skipping 10 matching lines @@
     // To block the request, we set its URL to an empty one.
     request->setURL(WebURL());
     return;
   }
 
   TRACE_EVENT_BEGIN("url.load", identifier, request_url);
   // Set the new substituted URL.
   request->setURL(GURL(TestShell::RewriteLocalUrl(request_url)));
 }
 
-void TestWebViewDelegate::DidFinishLoading(WebView* webview,
+void TestWebViewDelegate::DidFinishLoading(WebFrame* webframe,
                                            uint32 identifier) {
   TRACE_EVENT_END("url.load", identifier, "");
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     printf("%s - didFinishLoading\n",
            GetResourceDescription(identifier).c_str());
   }
 
   resource_identifier_map_.erase(identifier);
 }
 
-void TestWebViewDelegate::DidFailLoadingWithError(WebView* webview,
+void TestWebViewDelegate::DidFailLoadingWithError(WebFrame* webframe,
                                                   uint32 identifier,
                                                   const WebURLError& error) {
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     printf("%s - didFailLoadingWithError <WebError code %d,"
            " failing URL \"%s\">\n",
            GetResourceDescription(identifier).c_str(),
            error.reason,
            error.unreachableURL.spec().data());
   }
 
@@ skipping 639 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }