Switch to use Navigation events instead of provisional load events

chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc

 // Copyright 2016 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/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
@@ skipping 115 matching lines @@
   network_change_notifier_->set_online(online);
 }
 
 void OfflinePageTabHelperTest::StartLoad(const GURL& url) {
   controller().LoadURL(url, content::Referrer(), ui::PAGE_TRANSITION_TYPED,
                        std::string());
 }
 
 void OfflinePageTabHelperTest::CommitLoad(const GURL& url) {
   int entry_id = controller().GetPendingEntry()->GetUniqueID();
-  content::RenderFrameHostTester::For(main_rfh())->SendNavigate(
-      0, entry_id, true, url);
+  content::RenderFrameHostTester::For(main_rfh())
+      ->SendNavigate(0, entry_id, true, url);
 }
 
 void OfflinePageTabHelperTest::FailLoad(const GURL& url) {
-  content::RenderFrameHostTester::For(main_rfh())->SimulateNavigationError(
-      url, net::ERR_INTERNET_DISCONNECTED);
+  content::RenderFrameHostTester::For(main_rfh())->SimulateNavigationStart(url);
+  // Set up the error code for the failed navigation.
+  content::RenderFrameHostTester::For(main_rfh())->
+      SimulateNavigationError(url, net::ERR_INTERNET_DISCONNECTED);
+  content::RenderFrameHostTester::For(main_rfh())->
+      SimulateNavigationErrorPageCommit();
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
 }
 
 void OfflinePageTabHelperTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {
 }
 
 scoped_ptr<OfflinePageTestArchiver> OfflinePageTabHelperTest::BuildArchiver(
     const GURL& url,
@@ skipping 33 matching lines @@
   GURL online_url = page->url;
 
   StartLoad(online_url);
   EXPECT_EQ(online_url, controller().GetPendingEntry()->GetURL());
 
   FailLoad(online_url);
   EXPECT_EQ(offline_url, controller().GetPendingEntry()->GetURL());
 }
 
 }  // namespace offline_pages