Switch to use Navigation events instead of provisional load events

chrome/browser/android/offline_pages/offline_page_tab_helper.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 "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 43 matching lines @@
     return;
   last_redirect_from_url_ = navigation_handle->GetURL();
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&OfflinePageTabHelper::RedirectFromOfflineToOnline,
                  weak_ptr_factory_.GetWeakPtr(),
                  online_url));
 }
 
-void OfflinePageTabHelper::DidFailProvisionalLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description,
-    bool was_ignored_by_handler) {
+void OfflinePageTabHelper::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
   GURL last_redirect_from_url_copy = last_redirect_from_url_;
   last_redirect_from_url_ = GURL();
 
   // Skips non-main frame or load failure other than no network.
-  if (error_code != net::ERR_INTERNET_DISCONNECTED ||
-      render_frame_host->GetParent() != nullptr) {
+  if (navigation_handle->GetNetErrorCode() != net::ERR_INTERNET_DISCONNECTED ||
+      !navigation_handle->IsInMainFrame()) {
     return;
   }
 
   // Redirecting to offline version will only take effect when there is no
   // network connection.
   if (!net::NetworkChangeNotifier::IsOffline())
     return;
 
   // Skips if not loading an online version of saved page.
   GURL offline_url = offline_pages::OfflinePageUtils::GetOfflineURLForOnlineURL(
-      web_contents()->GetBrowserContext(), validated_url);
+      web_contents()->GetBrowserContext(), navigation_handle->GetURL());
   if (!offline_url.is_valid())
     return;
 
   // Avoids looping between online and offline redirections.
   if (last_redirect_from_url_copy == offline_url)
     return;
-  last_redirect_from_url_ = validated_url;
+  last_redirect_from_url_ = navigation_handle->GetURL();
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&OfflinePageTabHelper::RedirectFromOnlineToOffline,
                  weak_ptr_factory_.GetWeakPtr(),
                  offline_url));
 }
 
 void OfflinePageTabHelper::RedirectFromOfflineToOnline(const GURL& online_url) {
   UMA_HISTOGRAM_COUNTS("OfflinePages.RedirectToOnlineCount", 1);
   content::NavigationController::LoadURLParams load_params(online_url);
   load_params.transition_type = ui::PAGE_TRANSITION_CLIENT_REDIRECT;
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
 void OfflinePageTabHelper::RedirectFromOnlineToOffline(
     const GURL& offline_url) {
   UMA_HISTOGRAM_COUNTS("OfflinePages.RedirectToOfflineCount", 1);
   content::NavigationController::LoadURLParams load_params(offline_url);
   load_params.transition_type = ui::PAGE_TRANSITION_CLIENT_REDIRECT;
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
 }  // namespace offline_pages