Display confirmation dialog for untrusted signins

chrome/browser/ui/sync/one_click_signin_helper.cc

Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 8502d5271afd93e798e08d401bd93aec5ff1da58..be68472835bc2744d713116661481cfbfb5ffec0 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -229,14 +229,8 @@ void StartSync(const StartSyncArgs& args,
     return;
   }
 
-  // If we are giving the user the option to configure sync, then that will
-  // suffice as a confirmation.
   OneClickSigninSyncStarter::ConfirmationRequired confirmation =
       args.confirmation_required;

[Roger Tawa OOO till Jul 10th, 2013/06/20 07:51:29]

Can probably get rid of this local var too.  Its now only used once at line 239.

[noms (inactive), 2013/06/21 16:59:24]

Done.

-  if (start_mode == OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST &&
-      confirmation == OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN) {
-    confirmation = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
-  }
 
   // The starter deletes itself once its done.
   new OneClickSigninSyncStarter(args.profile, args.browser, args.session_index,
@@ -994,6 +988,7 @@ void OneClickSigninHelper::NavigateToPendingEntry(
       continue_url_.is_valid() &&
       url.ReplaceComponents(replacements) !=
           continue_url_.ReplaceComponents(replacements)) {
+    untrusted_confirmation_required_ = true;

[Roger Tawa OOO till Jul 10th, 2013/06/20 07:51:29]

I don't think this change and the one at line 1063 below are strictly required,
since the untrusted check is performed at the end of GAIA sign in process when
we get the G-A-S header.  However, these changes are useful in case the process
swap logic fails for some reason.

[noms (inactive), 2013/06/21 16:59:24]

As discussed, removed this change.
On 2013/06/20 07:51:29, Roger Tawa wrote:

     if (++untrusted_navigations_since_signin_visit_ > kMaxNavigationsSince)
       CleanTransientState();
   }
@@ -1064,9 +1059,10 @@ void OneClickSigninHelper::DidStopLoading(
       RedirectToNtpOrAppsPage(web_contents(), source_);
     }
 
-    if (!continue_url_match && !IsValidGaiaSigninRedirectOrResponseURL(url) &&
-        ++untrusted_navigations_since_signin_visit_ > kMaxNavigationsSince) {
-      CleanTransientState();
+    if (!continue_url_match && !IsValidGaiaSigninRedirectOrResponseURL(url)) {
+      untrusted_confirmation_required_ = true;
+      if (++untrusted_navigations_since_signin_visit_ > kMaxNavigationsSince)
+        CleanTransientState();
     }
 
     return;