Reland r242290, r241609, r242134.

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 41cbdcb4982500370354ed85b4a751d93478d18a..a5779ef2d6ea9505b85cf09f25aaa21c92546244 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -55,10 +55,10 @@
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/url_util.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/profile_management_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/browser/browser_thread.h"
@@ -96,6 +96,7 @@ struct StartSyncArgs {
                 const std::string& session_index,
                 const std::string& email,
                 const std::string& password,
+                const std::string& oauth_code,
                 content::WebContents* web_contents,
                 bool untrusted_confirmation_required,
                 signin::Source source,
@@ -107,6 +108,7 @@ struct StartSyncArgs {
   std::string session_index;
   std::string email;
   std::string password;
+  std::string oauth_code;
 
   // Web contents in which the sync setup page should be displayed,
   // if necessary. Can be NULL.
@@ -123,6 +125,7 @@ StartSyncArgs::StartSyncArgs(Profile* profile,
                              const std::string& session_index,
                              const std::string& email,
                              const std::string& password,
+                             const std::string& oauth_code,
                              content::WebContents* web_contents,
                              bool untrusted_confirmation_required,
                              signin::Source source,
@@ -133,6 +136,7 @@ StartSyncArgs::StartSyncArgs(Profile* profile,
       session_index(session_index),
       email(email),
       password(password),
+      oauth_code(oauth_code),
       web_contents(web_contents),
       source(source),
       callback(callback) {
@@ -376,7 +380,7 @@ void StartSync(const StartSyncArgs& args,
   // The starter deletes itself once its done.
   new OneClickSigninSyncStarter(args.profile, args.browser, args.session_index,
                                 args.email, args.password,
-                                "" /* oauth_code */, start_mode,
+                                args.oauth_code, start_mode,
                                 args.web_contents,
                                 args.confirmation_required,
                                 args.callback);
@@ -407,31 +411,39 @@ void StartExplicitSync(const StartSyncArgs& args,
                        content::WebContents* contents,
                        OneClickSigninSyncStarter::StartSyncMode start_mode,
                        ConfirmEmailDialogDelegate::Action action) {
+  bool enable_inline = switches::IsEnableInlineSignin();
   if (action == ConfirmEmailDialogDelegate::START_SYNC) {
     StartSync(args, start_mode);
-    OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary(
-        contents, args.source);
+    if (!enable_inline) {
+      // Redirect/tab closing for inline flow is handled by the sync callback.
+      OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary(
+          contents, args.source);
+    }
   } else {
     // Perform a redirection to the NTP/Apps page to hide the blank page when
     // the action is CLOSE or CREATE_NEW_USER. The redirection is useful when
     // the action is CREATE_NEW_USER because the "Create new user" page might
     // be opened in a different tab that is already showing settings.
-    //
-    // Don't redirect when the visible URL is not a blank page: if the
-    // source is SOURCE_WEBSTORE_INSTALL, |contents| might be showing an app
-    // page that shouldn't be hidden.
-    //
-    // If redirecting, don't do so immediately, otherwise there may be 2 nested
-    // navigations and a crash would occur (crbug.com/293261).  Post the task
-    // to the current thread instead.
-    if (signin::IsContinueUrlForWebBasedSigninFlow(
-            contents->GetVisibleURL())) {
-      base::MessageLoopProxy::current()->PostNonNestableTask(
-          FROM_HERE,
-          base::Bind(RedirectToNtpOrAppsPageWithIds,
-                     contents->GetRenderProcessHost()->GetID(),
-                     contents->GetRoutingID(),
-                     args.source));
+    if (enable_inline) {
+      // Redirect/tab closing for inline flow is handled by the sync callback.
+      args.callback.Run(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
+    } else {
+      // Don't redirect when the visible URL is not a blank page: if the
+      // source is SOURCE_WEBSTORE_INSTALL, |contents| might be showing an app
+      // page that shouldn't be hidden.
+      //
+      // If redirecting, don't do so immediately, otherwise there may be 2
+      // nested navigations and a crash would occur (crbug.com/293261).  Post
+      // the task to the current thread instead.
+      if (signin::IsContinueUrlForWebBasedSigninFlow(
+              contents->GetVisibleURL())) {
+        base::MessageLoopProxy::current()->PostNonNestableTask(
+            FROM_HERE,
+            base::Bind(RedirectToNtpOrAppsPageWithIds,
+                       contents->GetRenderProcessHost()->GetID(),
+                       contents->GetRoutingID(),
+                       args.source));
+      }
     }
     if (action == ConfirmEmailDialogDelegate::CREATE_NEW_USER) {
       chrome::ShowSettingsSubPage(args.browser,
@@ -765,14 +777,12 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
 OneClickSigninHelper::Offer OneClickSigninHelper::CanOfferOnIOThread(
     net::URLRequest* request,
     ProfileIOData* io_data) {
-  return CanOfferOnIOThreadImpl(request->url(), request->referrer(),
-                                request, io_data);
+  return CanOfferOnIOThreadImpl(request->url(), request, io_data);
 }
 
 // static
 OneClickSigninHelper::Offer OneClickSigninHelper::CanOfferOnIOThreadImpl(
     const GURL& url,
-    const std::string& referrer,
     base::SupportsUserData* request,
     ProfileIOData* io_data) {
   if (!gaia::IsGaiaSignonRealm(url.GetOrigin()))
@@ -1037,6 +1047,49 @@ void OneClickSigninHelper::ShowSigninErrorBubble(Browser* browser,
 }
 
 // static
+bool OneClickSigninHelper::HandleCrossAccountError(
+    content::WebContents* contents,
+    const std::string& session_index,
+    const std::string& email,
+    const std::string& password,
+    const std::string& oauth_code,
+    OneClickSigninHelper::AutoAccept auto_accept,
+    signin::Source source,
+    OneClickSigninSyncStarter::StartSyncMode start_mode,
+    OneClickSigninSyncStarter::Callback sync_callback) {
+  Profile* profile =
+      Profile::FromBrowserContext(contents->GetBrowserContext());
+  std::string last_email =
+      profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
+
+  if (!last_email.empty() && !gaia::AreEmailsSame(last_email, email)) {
+    // If the new email address is different from the email address that
+    // just signed in, show a confirmation dialog.
+
+    // 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::FindBrowserWithWebContents(contents);
+    ConfirmEmailDialogDelegate::AskForConfirmation(
+        contents,
+        last_email,
+        email,
+        base::Bind(
+            &StartExplicitSync,
+            StartSyncArgs(profile, browser, auto_accept,
+                          session_index, email, password, oauth_code, contents,
+                          false /* confirmation_required */, source,
+                          sync_callback),
+            contents,
+            start_mode));
+    return true;
+  }
+
+  return false;
+}
+
+// static
 void OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary(
     content::WebContents* contents, signin::Source source) {
   if (source != signin::SOURCE_SETTINGS &&
@@ -1112,8 +1165,6 @@ void OneClickSigninHelper::DidStartNavigationToPendingEntry(
   // clear the internal state.  This is needed to detect navigations in the
   // middle of the sign in process that may redirect back to the sign in
   // process (see crbug.com/181163 for details).
-  const GURL continue_url = signin::GetNextPageURLForPromoURL(
-      signin::GetPromoURL(signin::SOURCE_START_PAGE, false));
   GURL::Replacements replacements;
   replacements.ClearQuery();
 
@@ -1293,6 +1344,7 @@ void OneClickSigninHelper::DidStopLoading(
         StartSync(
             StartSyncArgs(profile, browser, auto_accept_,
                           session_index_, email_, password_,
+                          "" /* oauth_code */,
                           NULL /* don't force to show sync setup in same tab */,
                           true /* confirmation_required */, source_,
                           CreateSyncStarterCallback()),
@@ -1309,6 +1361,7 @@ void OneClickSigninHelper::DidStopLoading(
         StartSync(
             StartSyncArgs(profile, browser, auto_accept_,
                           session_index_, email_, password_,
+                          "" /* oauth_code */,
                           NULL  /* don't force sync setup in same tab */,
                           true  /* confirmation_required */, source_,
                           CreateSyncStarterCallback()),
@@ -1344,34 +1397,14 @@ void OneClickSigninHelper::DidStopLoading(
                   OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST :
               OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
 
-      std::string last_email =
-          profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
-
-      if (!last_email.empty() && !gaia::AreEmailsSame(last_email, email_)) {
-        // If the new email address is different from the email address that
-        // just signed in, show a confirmation dialog.
-
-        // 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.
-        ConfirmEmailDialogDelegate::AskForConfirmation(
-            contents,
-            last_email,
-            email_,
-            base::Bind(
-                &StartExplicitSync,
-                StartSyncArgs(profile, browser, auto_accept_,
-                              session_index_, email_, password_, contents,
-                              false /* confirmation_required */, source_,
-                              CreateSyncStarterCallback()),
-                contents,
-                start_mode));
-      } else {
+      if (!HandleCrossAccountError(contents, session_index_, email_, password_,
+              "" /* oauth_code */, auto_accept_, source_, start_mode,
+              CreateSyncStarterCallback())) {
         if (!do_not_start_sync_for_testing_) {
           StartSync(
               StartSyncArgs(profile, browser, auto_accept_,
-                            session_index_, email_, password_, contents,
+                            session_index_, email_, password_,
+                            "" /* oauth_code */, contents,
                             untrusted_confirmation_required_, source_,
                             CreateSyncStarterCallback()),
               start_mode);