Add error description to the DidFailProvisionalLoad callback.

content/browser/tab_contents/navigation_controller_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 405 matching lines @@
   const GURL kNewURL("http://eh");
   controller().LoadURL(kNewURL, GURL(), PageTransition::TYPED, std::string());
   EXPECT_EQ(0U, notifications.size());
   EXPECT_EQ(-1, controller().pending_entry_index());
   EXPECT_TRUE(controller().pending_entry());
   EXPECT_EQ(-1, controller().last_committed_entry_index());
   EXPECT_EQ(1, delegate->navigation_state_change_count());
 
   // It may abort before committing, if it's a download or due to a stop or
   // a new navigation from the user.
+  ViewHostMsg_DidFailProvisionalLoadWithError_Params params;
+  params.frame_id = 1;
+  params.is_main_frame = true;
+  params.error_code = net::ERR_ABORTED;
+  params.error_description = string16();
+  params.url = kNewURL;
+  params.showing_repost_interstitial = false;
   rvh()->TestOnMessageReceived(
-      ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
-                                                  1,  // frame_id
-                                                  true,  // is_main_frame
-                                                  net::ERR_ABORTED,  // error
-                                                  kNewURL,  // url
-                                                  false));  // repost
+          ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
+                                                      params));
 
   // This should clear the pending entry and notify of a navigation state
   // change, so that we do not keep displaying kNewURL.
   EXPECT_EQ(-1, controller().pending_entry_index());
   EXPECT_FALSE(controller().pending_entry());
   EXPECT_EQ(-1, controller().last_committed_entry_index());
   EXPECT_EQ(2, delegate->navigation_state_change_count());
 
   contents()->set_delegate(NULL);
 }
@@ skipping 29 matching lines @@
                                              false,  // opener
                                              kNewURL,  // old url
                                              kRedirectURL));  // new url
 
   // We don't want to change the NavigationEntry's url, in case it cancels.
   // Prevents regression of http://crbug.com/77786.
   EXPECT_EQ(kNewURL, controller().pending_entry()->url());
 
   // It may abort before committing, if it's a download or due to a stop or
   // a new navigation from the user.
+  ViewHostMsg_DidFailProvisionalLoadWithError_Params params;
+  params.frame_id = 1;
+  params.is_main_frame = true;
+  params.error_code = net::ERR_ABORTED;
+  params.error_description = string16();
+  params.url = kRedirectURL;
+  params.showing_repost_interstitial = false;
   rvh()->TestOnMessageReceived(
-      ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
-                                                  1,  // frame_id
-                                                  true,  // is_main_frame
-                                                  net::ERR_ABORTED,  // error
-                                                  kRedirectURL,  // url
-                                                  false));  // repost
+          ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
+                                                      params));
 
   // This should clear the pending entry and notify of a navigation state
   // change, so that we do not keep displaying kNewURL.
   EXPECT_EQ(-1, controller().pending_entry_index());
   EXPECT_FALSE(controller().pending_entry());
   EXPECT_EQ(-1, controller().last_committed_entry_index());
   EXPECT_EQ(2, delegate->navigation_state_change_count());
 
   contents()->set_delegate(NULL);
 }
@@ skipping 1023 matching lines @@
             our_controller.pending_entry());
   EXPECT_EQ(0, our_controller.GetEntryAtIndex(0)->page_id());
   EXPECT_EQ(NavigationEntry::RESTORE_NONE,
             our_controller.GetEntryAtIndex(0)->restore_type());
   EXPECT_TRUE(our_controller.GetEntryAtIndex(0)->site_instance());
 
   // This pending navigation may have caused a different navigation to fail,
   // which causes the pending entry to be cleared.
   TestRenderViewHost* rvh =
       static_cast<TestRenderViewHost*>(our_contents.render_view_host());
+  ViewHostMsg_DidFailProvisionalLoadWithError_Params fail_load_params;
+  fail_load_params.frame_id = 1;
+  fail_load_params.is_main_frame = true;
+  fail_load_params.error_code = net::ERR_ABORTED;
+  fail_load_params.error_description = string16();
+  fail_load_params.url = url;
+  fail_load_params.showing_repost_interstitial = false;
   rvh->TestOnMessageReceived(
-      ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
-                                                  1,  // frame_id
-                                                  true,  // is_main_frame
-                                                  net::ERR_ABORTED,  // error
-                                                  url,  // url
-                                                  false));  // repost
+          ViewHostMsg_DidFailProvisionalLoadWithError(0,  // routing_id
+                                                      fail_load_params));
 
   // Now the pending restored entry commits.
   ViewHostMsg_FrameNavigate_Params params;
   params.page_id = 0;
   params.url = url;
   params.transition = PageTransition::LINK;
   params.should_update_history = false;
   params.gesture = NavigationGestureUser;
   params.is_post = false;
   params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url));
@@ skipping 758 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */