Make sure the new confirmation bubble is always shown upon signin

chrome/browser/ui/sync/one_click_signin_helper.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/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 1169 matching lines @@
 
     // No need to display a second confirmation so pass false below.
     // TODO(atwilson): Move this into OneClickSigninSyncStarter.
     // The tab modal dialog always executes its callback before |contents|
     // is deleted.
     Browser* browser = chrome::FindLastActiveWithProfile(
         profile, chrome::GetActiveDesktop());
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
 
+    OneClickSigninHelper::StartSyncArgs start_sync_args(
+        StartSyncArgs(profile, browser, auto_accept,

[Roger Tawa OOO till Jul 10th, 2014/08/14 21:54:09]

Can this just be:

   StartSyncArgs start_sync_args(profile,...

+                      session_index, email, password,
+                      refresh_token,
+                      contents, false /* untrusted_confirmation_required */,
+                      source, sync_callback));
     // If the user signs in from the new avatar bubble, the confirm email dialog
-    // would dismiss the avatar bubble, thus it won't show any confirmation upon
-    // sign in completes. This confirmation dialog already mentions that user
-    // data would be synced, thus we just start sync immediately.
-    // TODO(guohui): add a sync settings link to allow user to configure sync
-    // settings before sync starts.
-    if (start_mode == OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST)
-      start_mode = OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
-
+    // would dismiss the avatar bubble, thus we need to manually re-show the
+    // avatar bubble to confirm sync settings.
+    if (start_mode == OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST) {
+      start_sync_args.confirmation_required =
+          OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
+    }
     ConfirmEmailDialogDelegate::AskForConfirmation(
         contents,
         last_email,
         email,
-        base::Bind(
-            &StartExplicitSync,
-            StartSyncArgs(profile, browser, auto_accept,
-                          session_index, email, password,
-                          refresh_token,
-                          contents, false /* confirmation_required */, source,
-                          sync_callback),
-            contents,
-            start_mode));
+        base::Bind(&StartExplicitSync, start_sync_args, contents, start_mode));
     return true;
   }
 
   return false;
 }
 
 // static
 void OneClickSigninHelper::RedirectToNtpOrAppsPage(
     content::WebContents* contents, signin::Source source) {
   // Do nothing if a navigation is pending, since this call can be triggered
@@ skipping 401 matching lines @@
     // If the web contents is showing a blank page and not about to be closed,
     // redirect to the NTP or apps page.
     if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
         !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
       RedirectToNtpOrAppsPage(
           web_contents(),
           signin::GetSourceForPromoURL(original_continue_url_));
     }
   }
 }