Make sure sync setup completes when signing in from the avatar bubble with modal warnings

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 5d82497907a4bab6c505ce4c760aadad57b06f9f..9f7422496a35d81882a7db91ba3971ca9aeac213 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -1187,6 +1187,16 @@ bool OneClickSigninHelper::HandleCrossAccountError(
         profile, chrome::GetActiveDesktop());
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
+
+    // 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;
+
     ConfirmEmailDialogDelegate::AskForConfirmation(
         contents,
         last_email,