Revert 246674 "Indicate which authentication flow was used in Us..."

trunk/src/chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1812 matching lines @@
     const User* user = (*it);
     if (user->email() == user_id) {
       user_already_logged_in = true;
       break;
     }
   }
   DCHECK(!user_already_logged_in);
 
   if (!user_already_logged_in) {
     // Will call OnProfilePrepared() once profile has been loaded.
-    LoginUtils::Get()->PrepareProfile(
-        UserContext(user_id,
-                    std::string(),  // password
-                    std::string(),  // auth_code
-                    user_id_hash,
-                    false,         // using_oauth
-                    UserContext::AUTH_FLOW_OFFLINE),
-        std::string(),  // display_email
-        false,          // has_cookies
-        true,           // has_active_session
-        this);
+    LoginUtils::Get()->PrepareProfile(UserContext(user_id,
+                                                  std::string(),  // password
+                                                  std::string(),  // auth_code
+                                                  user_id_hash,
+                                                  false),         // using_oauth
+                                      std::string(),  // display_email
+                                      false,          // has_cookies
+                                      true,           // has_active_session
+                                      this);
   } else {
     RestorePendingUserSessions();
   }
 }
 
 void UserManagerImpl::SendRegularUserLoginMetrics(const std::string& user_id) {
   // If this isn't the first time Chrome was run after the system booted,
   // assume that Chrome was restarted because a previous session ended.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kFirstExecAfterBoot)) {
@@ skipping 36 matching lines @@
   if (User* user = FindUserAndModify(user_id))
     user->SetAccountLocale(resolved_locale);
 }
 
 void UserManagerImpl::UpdateNumberOfUsers() {
   base::debug::SetCrashKeyValue(crash_keys::kNumberOfUsers,
       base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
 }
 
 }  // namespace chromeos