Convert MobileSetupUI to use the new navigation callbacks.

chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

 // Copyright (c) 2012 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/ui/webui/chromeos/mobile_setup_ui.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 22 matching lines @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
@@ skipping 568 matching lines @@
   web_ui->AddMessageHandler(base::MakeUnique<MobileSetupHandler>());
   MobileSetupUIHTMLSource* html_source = new MobileSetupUIHTMLSource();
 
   // Set up the chrome://mobilesetup/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 
   content::WebContentsObserver::Observe(web_ui->GetWebContents());
 }
 
-void MobileSetupUI::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
-  if (render_frame_host->GetFrameName() != "paymentForm")
+void MobileSetupUI::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->HasCommitted() ||
+      navigation_handle->GetRenderFrameHost()->GetFrameName() !=
+          "paymentForm") {
     return;
+  }
+
+  if (navigation_handle->IsErrorPage()) {
+    base::FundamentalValue result_value(-navigation_handle->GetNetErrorCode());
+    web_ui()->CallJavascriptFunctionUnsafe(kJsPortalFrameLoadFailedCallback,
+                                           result_value);
+    return;
+  }
 
   web_ui()->CallJavascriptFunctionUnsafe(kJsPortalFrameLoadCompletedCallback);
 }
-
-void MobileSetupUI::DidFailProvisionalLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description,
-    bool was_ignored_by_handler) {
-  if (render_frame_host->GetFrameName() != "paymentForm")
-    return;
-
-  base::FundamentalValue result_value(-error_code);
-  web_ui()->CallJavascriptFunctionUnsafe(kJsPortalFrameLoadFailedCallback,
-                                         result_value);
-}