Convert InlineLoginHandlerImpl to use the new navigation callbacks.

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

 // Copyright 2013 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/signin/inline_login_handler_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
 #include "components/signin/core/browser/about_signin_internals.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/browser/signin_investigator.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/strings/grit/components_strings.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 314 matching lines @@
 }
 
 InlineLoginHandlerImpl::InlineLoginHandlerImpl()
       : confirm_untrusted_signin_(false),
         weak_factory_(this) {
 }
 
 InlineLoginHandlerImpl::~InlineLoginHandlerImpl() {}
 
 // This method is not called with webview sign in enabled.
-void InlineLoginHandlerImpl::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
-  if (!web_contents())
+void InlineLoginHandlerImpl::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!web_contents() ||
+      !navigation_handle->HasCommitted() ||
+      navigation_handle->IsErrorPage()) {
     return;
+  }
 
   // Returns early if this is not a gaia webview navigation.
   content::RenderFrameHost* gaia_frame =
       signin::GetAuthFrame(web_contents(), "signin-frame");
-  if (render_frame_host != gaia_frame)
+  if (navigation_handle->GetRenderFrameHost() != gaia_frame)
     return;
 
   // Loading any untrusted (e.g., HTTP) URLs in the privileged sign-in process
   // will require confirmation before the sign in takes effect.
   const GURL kGaiaExtOrigin(
       GaiaUrls::GetInstance()->signin_completed_continue_url().GetOrigin());
-  if (!url.is_empty()) {
-    GURL origin(url.GetOrigin());
-    if (url.spec() != url::kAboutBlankURL &&
+  if (!navigation_handle->GetURL().is_empty()) {

[achuithb, 2017/01/27 01:11:16]

Does it make sense to have a stack var for navigation_handle->GetURL()?

[jam, 2017/01/27 01:39:05]

the getter returns a const reference, so it's the same efficiency as a stack
reference. since it didn't make any lines too long, I didn't create a stack
variable

+    GURL origin(navigation_handle->GetURL().GetOrigin());
+    if (navigation_handle->GetURL().spec() != url::kAboutBlankURL &&
         origin != kGaiaExtOrigin &&
         !gaia::IsGaiaSignonRealm(origin)) {
       confirm_untrusted_signin_ = true;
     }
   }
 }
 
 // static
 bool InlineLoginHandlerImpl::CanOffer(Profile* profile,
                                       CanOfferFor can_offer_for,
@@ skipping 444 matching lines @@
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
           signin::ManageAccountsParams(),
           signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
     }
   }
 }