Attempt to recover sync token for managed user once we detected that sync auth fails.

chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

Index: chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
diff --git a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
index cb5f6d4039ac961fcc5ff6e27fdc5cd9b9837a62..24be34e911afac31ff4fd20e1af2db45714a2e20 100644
--- a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
+++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
@@ -4,43 +4,23 @@
 
 #include "chrome/browser/chromeos/login/managed/supervised_user_login_flow.h"
 
-#include "base/file_util.h"
-#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
-#include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h"
+#include "chrome/browser/chromeos/login/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
-#include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
-namespace {
-
-std::string LoadSyncToken(base::FilePath profile_dir) {
-  std::string token;
-  base::FilePath token_file =
-      profile_dir.Append(kManagedUserTokenFilename);
-  VLOG(1) << "Loading" << token_file.value();
-  if (!base::ReadFileToString(token_file, &token)) {
-    return std::string();
-  }
-  return token;
-}
-
-} // namespace
-
 SupervisedUserLoginFlow::SupervisedUserLoginFlow(
     const std::string& user_id)
     : ExtendedUserFlow(user_id),
@@ -83,10 +63,11 @@ void SupervisedUserLoginFlow::OnSyncSetupDataLoaded(
 
 void SupervisedUserLoginFlow::ConfigureSync(const std::string& token) {
   data_loaded_ = true;
+
   // TODO(antrim): add error handling (no token loaded).
   // See also: http://crbug.com/312751
-  if (!token.empty())
-    ManagedUserServiceFactory::GetForProfile(profile_)->InitSync(token);
+  UserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
+      profile_, token);
 
   LoginUtils::Get()->DoBrowserLaunch(profile_, host());
   profile_ = NULL;
@@ -96,12 +77,8 @@ void SupervisedUserLoginFlow::ConfigureSync(const std::string& token) {
 void SupervisedUserLoginFlow::LaunchExtraSteps(
     Profile* profile) {
   profile_ = profile;
-  base::FilePath profile_dir = ProfileHelper::GetProfilePathByUserIdHash(
-      UserManager::Get()->GetUserByProfile(profile)->username_hash());
-  PostTaskAndReplyWithResult(
-      content::BrowserThread::GetBlockingPool(),
-      FROM_HERE,
-      base::Bind(&LoadSyncToken, profile_dir),
+  UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
+      profile,
       base::Bind(
            &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
            weak_factory_.GetWeakPtr()));