requestAutocomplete (desktop): don't get stuck in infinite loop

chrome/browser/ui/autofill/autofill_dialog_controller_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/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 951 matching lines @@
 }
 
 bool AutofillDialogControllerImpl::ShouldShowAccountChooser() const {
   return !ShouldShowSpinner() && GetManager()->IsCountryOfInterest("US");
 }
 
 bool AutofillDialogControllerImpl::ShouldShowSignInWebView() const {
   return !signin_registrar_.IsEmpty();
 }
 
-GURL AutofillDialogControllerImpl::SignInUrl() const {
-  return wallet::GetSignInUrl();
-}
-
 bool AutofillDialogControllerImpl::ShouldOfferToSaveInChrome() const {
   return IsAutofillEnabled() &&
       !IsPayingWithWallet() &&
       !profile_->IsOffTheRecord() &&
       IsManuallyEditingAnySection() &&
       !ShouldShowSpinner();
 }
 
 bool AutofillDialogControllerImpl::ShouldSaveInChrome() const {
   return profile_->GetPrefs()->GetBoolean(::prefs::kAutofillDialogSaveData);
@@ skipping 180 matching lines @@
   if (!ShouldShowSpinner())
     waiting_for_explicit_sign_in_response_ = false;
 
   switch (SignedInState()) {
     case SIGNED_IN:
       LogDialogLatencyToShow();
       break;
 
     case REQUIRES_SIGN_IN:
       if (handling_use_wallet_link_click_)
-        SignInLinkClicked();
+        ShowSignIn(wallet::GetSignInUrl(GetWalletClient()->user_index()));
       // Fall through.
     case SIGN_IN_DISABLED:
       // Switch to the local account and refresh the dialog.
       signin_helper_.reset();
       OnWalletSigninError();
       handling_use_wallet_link_click_ = false;
       break;
 
     case REQUIRES_PASSIVE_SIGN_IN:
       // Attempt to passively sign in the user.
@@ skipping 1075 matching lines @@
   }
 
   return notifications;
 }
 
 void AutofillDialogControllerImpl::LinkClicked(const GURL& url) {
   OpenTabWithUrl(url);
 }
 
 void AutofillDialogControllerImpl::SignInLinkClicked() {
+  AddAccount();
+}
+
+void AutofillDialogControllerImpl::ShowSignIn(const GURL& url) {
   ScopedViewUpdates updates(view_.get());
 
   if (SignedInState() == NOT_CHECKED) {
     handling_use_wallet_link_click_ = true;
     account_chooser_model_->SelectWalletAccount(0);
     FetchWalletCookie();
   } else if (signin_registrar_.IsEmpty()) {
     // Start sign in.
     waiting_for_explicit_sign_in_response_ = true;
-    content::Source<content::NavigationController> source(view_->ShowSignIn());
+    content::Source<content::NavigationController> source(
+        view_->ShowSignIn(url));
     signin_registrar_.Add(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source);
 
     GetMetricLogger().LogDialogUiEvent(
         AutofillMetrics::DIALOG_UI_SIGNIN_SHOWN);
   } else {
     waiting_for_explicit_sign_in_response_ = false;
     HideSignIn();
   }
 
@@ skipping 326 matching lines @@
 
 void AutofillDialogControllerImpl::OnPassiveSigninSuccess() {
   FetchWalletCookie();
 }
 
 void AutofillDialogControllerImpl::OnPassiveSigninFailure(
     const GoogleServiceAuthError& error) {
   signin_helper_.reset();
   passive_failed_ = true;
 
-  if (handling_use_wallet_link_click_ ||
-      GetWalletClient()->user_index() != 0) {
-    // TODO(estade): When a secondary account is selected and fails passive
-    // auth, we show a sign in page. Currently we show the generic add account
-    // page, but we should instead show sign in for the selected account.
-    // http://crbug.com/323327
-    SignInLinkClicked();
+  if (handling_use_wallet_link_click_ || GetWalletClient()->user_index() != 0) {

[groby-ooo-7-16, 2014/10/17 20:14:12]

Mind hoisting the comment (minus TODO) over? It's somewhat clear from the
function name/user_index test, but it wouldn't hurt to spell it out. 

[Evan Stade, 2014/10/17 20:43:18]

Done.

+    ShowSignIn(wallet::GetSignInUrl(GetWalletClient()->user_index()));
     handling_use_wallet_link_click_ = false;
   }
 
   OnWalletSigninError();
 }
 
 void AutofillDialogControllerImpl::OnDidFetchWalletCookieValue(
     const std::string& cookie_value) {
   wallet_cookie_value_ = cookie_value;
   signin_helper_.reset();
@@ skipping 95 matching lines @@
     // and address.
     wallet_items_.reset();
     GetWalletItems();
   } else {
     SuggestionsUpdated();
     UpdateAccountChooserView();
   }
 }
 
 void AutofillDialogControllerImpl::AddAccount() {
-  SignInLinkClicked();
+  ShowSignIn(wallet::GetAddAccountUrl());
 }
 
 void AutofillDialogControllerImpl::UpdateAccountChooserView() {
   if (view_) {
     ScopedViewUpdates updates(view_.get());
     view_->UpdateAccountChooser();
     view_->UpdateNotificationArea();
   }
 }
 
@@ skipping 1396 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill