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

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

 // Copyright (c) 2012 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.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 90 matching lines @@
   explicit PublicAccountUser(const std::string& email);
   virtual ~PublicAccountUser();
 
   // Overridden from User:
   virtual UserType GetType() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
 };
 
-UserContext::UserContext() : using_oauth(true), auth_flow(AUTH_FLOW_OFFLINE) {
+UserContext::UserContext() : using_oauth(true) {
 }
 
 UserContext::UserContext(const std::string& username,
                          const std::string& password,
                          const std::string& auth_code)
     : username(username),
       password(password),
       auth_code(auth_code),
-      using_oauth(true),
-      auth_flow(AUTH_FLOW_OFFLINE) {
+      using_oauth(true) {
 }
 
 UserContext::UserContext(const std::string& username,
                          const std::string& password,
                          const std::string& auth_code,
                          const std::string& username_hash)
     : username(username),
       password(password),
       auth_code(auth_code),
       username_hash(username_hash),
-      using_oauth(true),
-      auth_flow(AUTH_FLOW_OFFLINE) {
+      using_oauth(true) {
 }
 
 UserContext::UserContext(const std::string& username,
                          const std::string& password,
                          const std::string& auth_code,
                          const std::string& username_hash,
-                         bool using_oauth,
-                         AuthFlow auth_flow)
+                         bool using_oauth)
     :  username(username),
        password(password),
        auth_code(auth_code),
        username_hash(username_hash),
-       using_oauth(using_oauth),
-       auth_flow(auth_flow) {
+       using_oauth(using_oauth) {
 }
 
 UserContext::~UserContext() {
 }
 
 bool UserContext::operator==(const UserContext& context) const {
   return context.username == username &&
          context.password == password &&
          context.auth_code == auth_code &&
          context.username_hash == username_hash &&
-         context.using_oauth == using_oauth &&
-         context.auth_flow == auth_flow;
+         context.using_oauth == using_oauth;
 }
 
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
       base::UTF8ToUTF16(GetAccountName(true)) :
       display_name_;
 }
 
 std::string User::GetAccountName(bool use_display_email) const {
@@ skipping 180 matching lines @@
     case USER_TYPE_LOCALLY_MANAGED:
     case USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace chromeos