Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/sync/sync_setup_flow.cc

Index: chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index ff923da22d20b5afcc8098b14d26dde584e37067..69c2b192cf7173d643f65cc335ae9e2a95da5fd4 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -14,9 +14,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/user_manager.h"
-#endif
 #if defined(OS_MACOSX)
 #include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h"
 #endif
@@ -398,14 +395,11 @@ void SyncSetupFlow::GetArgsForGaiaLogin(const ProfileSyncService* service,
     args->SetInteger("error", error.state());
     args->SetBoolean("editable_user", true);
   } else {
-    string16 user(service->GetAuthenticatedUsername());
-#if defined(OS_CHROMEOS)
-    if (user.empty()) {
-      std::string email =
-          chromeos::UserManager::Get()->logged_in_user().email();
-      user = UTF8ToUTF16(email);
-    }
-#endif
+    string16 user;
+    if (!service->cros_user().empty())
+      user = UTF8ToUTF16(service->cros_user());
+    else
+      user = service->GetAuthenticatedUsername();
     args->SetString("user", user);
     args->SetInteger("error", 0);
     args->SetBoolean("editable_user", user.empty());