Move alternate error page loading out of WebFrame.

Make the RenderView be in charge of loading alternate error pages.

While working on this change, I noticed several related bugs:

1-  Loading an URL with an invalid host name from the new tab page results in
an error page.  If you hit back and then forward, you will be left with an
empty location bar.  In a debug build this trips an assertion in
ClassifyNavigation because the given page_id is -1.  This problem is caused by
not duplicating the NavigationState of the failed load when creating a load for
the error page.  Hence, the pending_page_id of the forward navigation is lost.

2-  Loading an URL with an invalid host name as a subframe results in an extra
navigation in session history.  One navigation for the main frame and one
navigation for the error page load.  This is another symptom of the problem
described in #1.  However, the solution is different.  Here, we need to know
that the subframe load is an AUTO_SUBFRAME load so that we load the error page
using 'replace' semantics (so that WebCore does not generate a new session
history entry).

Finally, I decided to restrict alternative DNS error pages to only work for the
main frame to match what we do for alternative 404 error pages.  It doesn't seem
worth it to show link doctor results for subframes since their primary purpose
is to assist people who mis-type an URL.

R=tony,brettw
BUG=15648
TEST=covered by errorpage_uitest.cc

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

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

1 files changed, 9 insertions, 3 deletions

diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h
index 771ef55..ec45808 100644
--- a/chrome/renderer/navigation_state.h
+++ b/chrome/renderer/navigation_state.h
@@ -9,6 +9,7 @@
 #include "base/time.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/api/public/WebDataSource.h"
+#include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/searchable_form_data.h"
 
@@ -36,9 +37,6 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id() const { return pending_page_id_; }
 
-  // Is this a new navigation?
-  bool is_new_navigation() const { return pending_page_id_ == -1; }
-
   // Contains the transition type that the browser specified when it
   // initiated the load.
   PageTransition::Type transition_type() const { return transition_type_; }
@@ -132,6 +130,13 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
     password_form_data_.reset(data);
   }
 
+  webkit_glue::AltErrorPageResourceFetcher* alt_error_page_fetcher() const {
+    return alt_error_page_fetcher_.get();
+  }
+  void set_alt_error_page_fetcher(webkit_glue::AltErrorPageResourceFetcher* f) {
+    alt_error_page_fetcher_.reset(f);
+  }
+
   const std::string& security_info() const {
     return security_info_;
   }
@@ -166,6 +171,7 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
   int32 pending_page_id_;
   scoped_ptr<webkit_glue::SearchableFormData> searchable_form_data_;
   scoped_ptr<webkit_glue::PasswordForm> password_form_data_;
+  scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
   std::string security_info_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationState);