Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2010 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/sync/sync_setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #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
 #include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 361 matching lines @@
 // static
 void SyncSetupFlow::GetArgsForGaiaLogin(const ProfileSyncService* service,
                                         DictionaryValue* args) {
   args->SetString("iframeToShow", "login");
   const GoogleServiceAuthError& error = service->GetAuthError();
   if (!service->last_attempted_user_email().empty()) {
     args->SetString("user", service->last_attempted_user_email());
     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());
   }
 
   args->SetString("captchaUrl", error.captcha().image_url.spec());
 }
 
 // static
 void SyncSetupFlow::GetArgsForEnterPassphrase(
@@ skipping 276 matching lines @@
                                       const std::string& mode) {
   if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) {
     service_->SetPassphrase(passphrase, mode == std::string("enter"));
     Advance(SyncSetupWizard::SETTING_UP);
   } else if (configuration_pending_) {
     DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_);
     configuration_.secondary_passphrase = passphrase;
     OnConfigurationComplete();
   }
 }