Revert of Added affiliation IDs for the new affiliation determination.

components/user_manager/user.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_H_
 #define COMPONENTS_USER_MANAGER_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 147 matching lines @@
 
   // True if current user is logged in.
   bool is_logged_in() const;
 
   // True if current user is active within the current session.
   bool is_active() const;
 
   // True if the user Profile is created.
   bool is_profile_created() const { return profile_is_created_; }
 
-  // True if the user is affiliated to the device.
-  bool is_affiliated() const { return is_affiliated_; }
-
  protected:
   friend class UserManagerBase;
   friend class chromeos::ChromeUserManagerImpl;
   friend class chromeos::SupervisedUserManagerImpl;
   friend class chromeos::UserImageManagerImpl;
   friend class chromeos::UserSessionManager;
 
   // For testing:
   friend class FakeUserManager;
   friend class chromeos::FakeChromeUserManager;
@@ skipping 58 matching lines @@
 
   void set_can_lock(bool can_lock) { can_lock_ = can_lock; }
 
   void set_is_active(bool is_active) { is_active_ = is_active; }
 
   void set_profile_is_created() { profile_is_created_ = true; }
 
   // True if user has google account (not a guest or managed user).
   bool has_gaia_account() const;
 
-  void set_affiliation(bool is_affiliated) {
-    is_affiliated_ = is_affiliated;
-  }
-
  private:
   std::string email_;
   base::string16 display_name_;
   base::string16 given_name_;
   // The displayed user email, defaults to |email_|.
   std::string display_email_;
   bool using_saml_;
   UserImage user_image_;
   OAuthTokenStatus oauth_token_status_;
   bool force_online_signin_;
@@ skipping 22 matching lines @@
 
   // True if user is currently logged in in current session.
   bool is_logged_in_;
 
   // True if user is currently logged in and active in current session.
   bool is_active_;
 
   // True if user Profile is created
   bool profile_is_created_;
 
-  // True if the user is affiliated to the device.
-  bool is_affiliated_;
-
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_H_